Skip to content

Instantly share code, notes, and snippets.

@JayHollingum

JayHollingum/git-merge-all-their-changes

Created November 25, 2019 16:14
Show Gist options
  • Save JayHollingum/1d55251827eaf84b6eaa4acfc214997b to your computer and use it in GitHub Desktop.
Save JayHollingum/1d55251827eaf84b6eaa4acfc214997b to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git-merge-all-their-changes
git merge -Xtheirs branch-to-merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment