Changes between Version 96 and Version 97 of DeveloperGuidelines/Git


Ignore:
Timestamp:
03/18/14 09:30:16 (7 years ago)
Author:
Fran Boon
Comment:

Cherry-picking

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v96 v97  
    400400}}}
    401401https://docs.google.com/drawings/d/1Vhvm1EmqWOVNZkZsiJ0MLLpdTl6H_ya263Tdb2HK1N0/edit
     402
     403=== Cherry-picking ===
     404If a Pull Request contains multiple commits & you only wish to merge one of them in, then this can be done as follows:
     405{{{
     406# Create a temporary local branch
     407git checkout -b cherry_temp master
     408# Pull all their changes into this
     409git pull https://github.com/their_username/eden.git their_branch
     410# Switch to your master branch
     411git checkout master
     412# Select the commit you wish to pull-in
     413git cherry-pick abc0123
     414# Verify new commit in-place
     415git log
     416# Cleanup
     417git branch -D cherry_temp
     418# Push
     419git push origin master
     420}}}
    402421== Developer Configuration ==
    403422