質問編集履歴
1
あ
test
CHANGED
File without changes
|
test
CHANGED
@@ -31,27 +31,3 @@
|
|
31
31
|
error: you need to resolve your current index first
|
32
32
|
|
33
33
|
```
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
でもかと言って、素直に git marge masterとかやると下記のように怒られてしまします。
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
```git
|
44
|
-
|
45
|
-
git merge master
|
46
|
-
|
47
|
-
error: Merging is not possible because you have unmerged files.
|
48
|
-
|
49
|
-
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
|
50
|
-
|
51
|
-
hint: as appropriate to mark resolution and make a commit.
|
52
|
-
|
53
|
-
fatal: Exiting because of an unresolved conflict.
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
```
|