Changes between Version 96 and Version 97 of DeveloperGuidelines/Git

Timestamp:

03/18/14 09:30:16 (12 years ago)

Author:

Fran Boon

Comment:

Cherry-picking

DeveloperGuidelines/Git

@@ -400 +400 @@
 }}}
 https://docs.google.com/drawings/d/1Vhvm1EmqWOVNZkZsiJ0MLLpdTl6H_ya263Tdb2HK1N0/edit
+
+=== Cherry-picking ===
+If a Pull Request contains multiple commits & you only wish to merge one of them in, then this can be done as follows:
+{{{
+# Create a temporary local branch
+git checkout -b cherry_temp master
+# Pull all their changes into this
+git pull https://github.com/their_username/eden.git their_branch
+# Switch to your master branch
+git checkout master
+# Select the commit you wish to pull-in
+git cherry-pick abc0123
+# Verify new commit in-place
+git log
+# Cleanup
+git branch -D cherry_temp
+# Push
+git push origin master
+}}}
 == Developer Configuration ==