Skip to content

Instantly share code, notes, and snippets.

@drmuey

drmuey/git ours and theirs behavior.md

Last active March 25, 2021 21:36
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 drmuey/b1dfd2e2571e303e85b0caafa653f901 to your computer and use it in GitHub Desktop.
Save drmuey/b1dfd2e2571e303e85b0caafa653f901 to your computer and use it in GitHub Desktop.
Download ZIP
git ours and theirs behavior with merge and rebase
Raw
git ours and theirs behavior.md

With my-awesome-work branch checked out:

What you want to do git merge master git rebase master
Keep changes from master -Xtheirs -Xours
Keep changes from my-awesome-work -Xours -Xtheirs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment