Created
May 11, 2012 03:29
-
-
Save dpwright/2657349 to your computer and use it in GitHub Desktop.
Git merge driver which always accepts your own version of a 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
| # I want to keep MY version when there is a conflict | |
| # Nothing to do: %A (the second parameter) already contains my version | |
| # Just indicate the merge has been successfully "resolved" with the exit status | |
| exit 0 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
This code taken from this answer on stackoverflow.