在推送时撤消 git 合并
Undo a git merge when it has been pushed
合并后已经推送到master,如何撤消合并?
这是我的步骤:
git add -A
git commit -m "some message"
git fetch origin master:master
git rebase master (resolve merge conflicts)
git push -f origin my local branch
我想回到第 2 步的状态
您强制推送,这意味着您覆盖 遥控器上的更改。 您的计算机无法修复;但是,如果在强制推送之前有另一台计算机具有本地副本,则可以从该计算机强制推送并覆盖您的强制推送。
Git's push --force is destructive because it unconditionally
overwrites the remote repository with whatever you have locally,
possibly overwriting any changes that a team member has pushed in the
meantime. - Atlaissan Git Resource
在某些情况下,签出旧提交然后强制推送可能会起作用,但我怀疑这可能不适用于您的情况,因为您必须强制推送您的更改。
合并后已经推送到master,如何撤消合并? 这是我的步骤:
git add -A
git commit -m "some message"
git fetch origin master:master
git rebase master (resolve merge conflicts)
git push -f origin my local branch
我想回到第 2 步的状态
您强制推送,这意味着您覆盖 遥控器上的更改。 您的计算机无法修复;但是,如果在强制推送之前有另一台计算机具有本地副本,则可以从该计算机强制推送并覆盖您的强制推送。
Git's push --force is destructive because it unconditionally overwrites the remote repository with whatever you have locally, possibly overwriting any changes that a team member has pushed in the meantime. - Atlaissan Git Resource
在某些情况下,签出旧提交然后强制推送可能会起作用,但我怀疑这可能不适用于您的情况,因为您必须强制推送您的更改。