Merging patches (moved): Difference between revisions

Merging patches (moved) (view source)

430 bytes removed , 11 years ago

m

Anonymous user

Revision as of 05:37, 18 October 2010 (view source) 209.6.39.9 (talk) No edit summary ← Older edit		Latest revision as of 19:09, 22 August 2012 (view source) imported>Mdaniel m (Mdaniel moved page Merging patches to Merging patches (moved))
(5 intermediate revisions by 4 users not shown)
Line 1: ~~[[Category:~~{{Hacking OpenHatch]]}}▼ ~~'''Objective''': Someone gives you a patch to OpenHatch. What now?~~ We are updating our documentation system. This page is now included in our project package, and is automatically generated by sphinx at openhatch.readthedocs.org [http://openhatch.readthedocs.org/en/latest/contributor/merging_patches.html Merging patches] ~~== Step 0: Fetch the patch file and get the latest code from "origin" ==~~ ~~wget http://openhatch.org/bugs/file33/whatever~~ ~~git fetch~~ ~~== Step 1: Create a new local topic branch, based on origin/master ==~~ ~~git checkout origin/master -b new_topic_branch~~ ~~== Step 2: Apply said file ==~~ ~~git am < file_created_by_wget.patch~~ ~~== Step 3: Make sure it worked ==~~ ~~If it ''did'' work, you will have some commits on ''top'' of origin/master:~~ ~~git log --decorate~~ ~~== Conclusion ==~~ ~~That's all you need to do, in order to apply a patch. You might want to now ''test'' the patch, or provide feedback to the submitter.~~ ▲[[Category:Hacking OpenHatch]]