回答編集履歴
1
Fix git operation
test
CHANGED
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
|
|
45
45
|
git checkout A
|
|
46
46
|
|
|
47
|
-
git reset revision_before_merge
|
|
47
|
+
git reset --hard revision_before_merge
|
|
48
48
|
|
|
49
49
|
git merge master
|
|
50
50
|
|