好吧,我搞砸了,然后提交并将我的更改推送到一个分支,该分支应该充当干净的主分支,名为release/2.0
。因此,我提交并推送并合并了所有内容到这个主分支。
相反,我应该在release/2.0
上创建一个分支,并将我所有的工作放在其中,然后提交、推送和合并到release2.0
。
我该如何做到这一点?这是我的git reflog --date=iso
22a3aed (HEAD -> member_benefits_config, origin/release/2.0, release/2.0) HEAD@{2019-07-08 13:50:12 -0500}: checkout: moving from release/2.0 to member_benefits_config
22a3aed (HEAD -> member_benefits_config, origin/release/2.0, release/2.0) HEAD@{2019-07-08 13:36:51 -0500}: pull origin release/2.0: Merge made by the 'recursive' strategy.
2da8de0 HEAD@{2019-07-08 13:35:28 -0500}: commit: Added MemberBenefits configuration
4652cf5 (origin/master, origin/HEAD, master) HEAD@{2019-07-08 13:32:22 -0500}: checkout: moving from master to release/2.0
4652cf5 (origin/master, origin/HEAD, master) HEAD@{2019-07-08 13:32:10 -0500}: reset: moving to HEAD~1
8bd42a0 HEAD@{2019-07-08 13:01:19 -0500}: commit: Added MemberBenefits step component
4652cf5 (origin/master, origin/HEAD, master) HEAD@{2019-07-01 11:24:26 -0500}: clone: from https://CortesD@bitbucket.nfib.org/scm/enga/engage-application.framework.git
我会在“主”分支上执行git reset --hard 22a3aed
吗?或者4652cf5
提交,因为我第一次搞砸了,所以我不得不做一个重置。
发布于 2019-07-09 02:58:23
假设在release/2.0
上提交了以下内容
17f4e3b87 commit 5
b5fdf57ab commit 4
ad53f1aa0 commit 3
3b6864d4d commit 2
88b87878d commit 1
假设"commit 2“是您想要返回的提交。您可以执行以下操作:
# create a branch and push changes to it
(release/2.0) git checkout -b my_branch
(my_branch) git push origin my_branch
现在,在引入更改之前,将release/2.0
重置为one commit:
git checkout release/2.0
git reset --hard 3b6864d4d
git push origin releases/2.0 -f
https://stackoverflow.com/questions/56940899
复制相似问题