Skip to content

Instantly share code, notes, and snippets.

@maxchirkov

maxchirkov/new_gist_file

Created April 2, 2013 22:02
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 maxchirkov/5296616 to your computer and use it in GitHub Desktop.
Save maxchirkov/5296616 to your computer and use it in GitHub Desktop.
Download ZIP
Resolving conflicts by accepting "theirs" version of the file.
Raw
new_gist_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