Created
January 15, 2013 00:17
-
-
Save tkreis/4534822 to your computer and use it in GitHub Desktop.
merge file from different branch with current 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
| git checkout --merge "branch" "file" | |
| git mergetool |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment