Created
May 24, 2012 03:07
-
-
Save sprhawk/2779210 to your computer and use it in GitHub Desktop.
git co ours or theirs
This file contains 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
| git checkout --ours -- path/to/file.txt | |
| git checkout --theirs -- path/to/file.txt |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment