Skip to content

Instantly share code, notes, and snippets.

@elcritch

elcritch/gist:8ecbe83943eafb5b7009

Created October 21, 2015 20:11
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 elcritch/8ecbe83943eafb5b7009 to your computer and use it in GitHub Desktop.
Save elcritch/8ecbe83943eafb5b7009 to your computer and use it in GitHub Desktop.
Download ZIP
Git Merge Conflict: accept ours/theirs
Raw
gistfile1.txt
git checkout [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment