Skip to content

Instantly share code, notes, and snippets.

@djburdick

djburdick/merge_conflicts_take_our_or_theirs

Created May 25, 2013 19:50
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save djburdick/5650530 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save djburdick/5650530 to your computer and use it in GitHub Desktop.
Download ZIP
Merge conflict take ours or theirs. #git
Raw
merge_conflicts_take_our_or_theirs
git co --theirs config/routes.rb
# theirs means the branch you are merging into the current branch
git co --ours config/routes.rb
# ours means the current branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment