回答編集履歴
1
Fix git operation
answer
CHANGED
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
|
|
22
22
|
```console
|
|
23
23
|
git checkout A
|
|
24
|
-
git reset revision_before_merge
|
|
24
|
+
git reset --hard revision_before_merge
|
|
25
25
|
git merge master
|
|
26
26
|
git push -f origin A
|
|
27
27
|
```
|