git merge merge错误 —— 纠正
1. merge 信息:
commit 8cfc0bd578de4022553e23398d5b60afcc6f47ca
Merge: b1e410b41 26f2148ad
Author: ****** <*****.com>
Date: Thu Jun 3 14:53:45 2021 +0800
Merge branch 'feature/v2.7_a' into v2.7_w
2.merge 纠正:
git revert -m 2 8cfc0bd578de4022553e23398d5b60afcc6f47ca
这个commit错误地合并了分支,需要撤销merge:
git revert -m {1 or 2} 414b65a80446********8281c4479f01
如果要revert到第一个commit,参数选择1,如果要revert到第2个commit,选择2.