[Commons Wiki] Update of "UsingGIT" by StefanBodewig

[Apache Wiki <wi...@apache.org>]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Commons Wiki" for change notification.

The "UsingGIT" page has been changed by StefanBodewig:
https://wiki.apache.org/commons/UsingGIT?action=diff&rev1=18&rev2=19

  
  If you've done it right, the PR will be marked as merged at !GitHub. Remember that this will only work if the original commits of the contributor show up in the history of the component's repository.
  
+ == Applying Pull Requests (for git based components) - alternative approach ==
+ 
+ Much like for svn based you can download a git patch file by appending ".patch" to the URI of the pull request, e.g. https://github.com/apache/commons-foo/pull/72.patch
+ 
+ Inside the working copy of your commons component check out the master branch and apply the patch using "git am", this will preserve the original infoamtion of the original commits.
+ 
+ {{{
+ $ git checkout master
+ $ git pull
+ $ git am 72.patch
+ }}}
+ 
+ If there haven't been any merge conflicts you can simply push the result. Otherwise you've got to resolve the conflict and commit the result of the merge before pushing.
+ 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org