- Git 13 [転載禁止]©2ch.net
255 ：デフォルトの名無しさん[sage]：2015/10/24(土) 10:46:19.37 ID:lVXmpGjQ - git pull --depth 1ってしたら
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 1 different commit each, respectively.
(use "git pull" to merge the remote branch into yours)
You have unmerged paths.
(fix conflicts and run "git commit")
ってなったんですがこれはどうしたらいいのか教えてください
| - Git 13 [転載禁止]©2ch.net
256 ：デフォルトの名無しさん[sage]：2015/10/24(土) 10:47:13.63 ID:lVXmpGjQ - git commit したら
error: commit is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
ってでました
|
|