Skip to content

Instantly share code, notes, and snippets.

@maxchirkov
Created April 2, 2013 22:02
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
Star You must be signed in to star a gist
Embed
What would you like to do?
Resolving conflicts by accepting "theirs" version of the file.
http://stackoverflow.com/questions/161813/how-do-i-fix-merge-conflicts-in-git#3407920
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment