Created
May 23, 2015 08:32
-
-
Save nushio3/b11df001d7954b5c85b1 to your computer and use it in GitHub Desktop.
Git for Windowsでコンフリクト解決するときの手順 ref: http://qiita.com/nushio/items/601d89a8ce5844384f15
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
| <<<<<<<<<<<< HEAD | |
| ローカルの変更内容 | |
| ============ | |
| リモートの変更内容 | |
| >>>>>>>>>>>> リモートブランチの名前 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment