Skip to content

Instantly share code, notes, and snippets.

@kehers

kehers/gist:e307692ada383442567e3ed080e53c51

Last active November 19, 2017 02:22
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save kehers/e307692ada383442567e3ed080e53c51 to your computer and use it in GitHub Desktop.
Save kehers/e307692ada383442567e3ed080e53c51 to your computer and use it in GitHub Desktop.
Download ZIP
Selective Merging
Raw
gistfile1.txt
git diff updated_branch..lagging_branch
// After reviewing differences, loop through each file to merge
git checkout lagging_branch
git checkout updated_branch -- path/file
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment