Created
April 2, 2013 22:02
-
-
Save maxchirkov/5296616 to your computer and use it in GitHub Desktop.
Resolving conflicts by accepting "theirs" version of the file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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