如何解决如何git还原樱桃挑选完成的合并提交
我想还原这3个提交295e8ce6e63e39b87548f2f52b3eb0d5139999ef
,fb690eaec7938abbd614b0b07a5364998c09f7a5
和92ed5ce3d6b4cb70e56f74f17e80df960311b647
。我能够还原最后一个295e8ce6e63e39b87548f2f52b3eb0d5139999ef
,但无法还原底部2。我尝试了以下操作:
$git revert fb690eaec7938abbd614b0b07a5364998c09f7a5 -m 1
$git revert 92ed5ce3d6b4cb70e56f74f17e80df960311b647 -m 1
然后我得到
Already up to date!
On branch feature
Your branch is up to date with 'origin/feature'.
nothing to commit,working tree clean
但是我的git日志不会还原最近的两次提交,并且保持不变:
commit d81838a9dc973acbe03865dce0533bd41e77860e (HEAD -> feature,origin/feature)
Author: abc
Date: Thu Nov 5 14:08:59 2020 -0800
Revert "merge PR #173"
This reverts commit 295e8ce6e63e39b87548f2f52b3eb0d5139999ef.
commit 295e8ce6e63e39b87548f2f52b3eb0d5139999ef
Author: xyz
Date: Fri Aug 28 22:30:12 2020 -0700
merge PR #173
commit fb690eaec7938abbd614b0b07a5364998c09f7a5
Merge: 3cef115 92ed5ce
Author: abc
Date: Thu Nov 5 12:29:19 2020 -0800
Merging changes from e6a35ad0b2363932ac190ec602a7fd0c8bf9f04f
commit 92ed5ce3d6b4cb70e56f74f17e80df960311b647 (temp)
Author: xyz
Date: Wed Sep 2 17:32:07 2020 -0700
readjust null values for double data type from v5
版权声明:本文内容由互联网用户自发贡献,该文观点与技术仅代表作者本人。本站仅提供信息存储空间服务,不拥有所有权,不承担相关法律责任。如发现本站有涉嫌侵权/违法违规的内容, 请发送邮件至 dio@foxmail.com 举报,一经查实,本站将立刻删除。