Skip to content

Instantly share code, notes, and snippets.

@dmitriynet

dmitriynet/git-merge strategy

Created October 27, 2015 09:04
Show Gist options
  • Save dmitriynet/55f0e722e2971917594c to your computer and use it in GitHub Desktop.
Save dmitriynet/55f0e722e2971917594c to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git-merge strategy
git merge -X theirs origin/develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment