如果你使用TortoiseGit推送对话

引用来源:https://tortoisegit.org/docs/tortoisegit/tgit-dug-push.html#id692368

known changes - This allows remote repository to accept a safer non-fast-forward push. This can cause the remote repository to lose commits; use it with care. This can prevent from losing unknown changes from other people on the remote. It checks if the server branch points to the same commit as the remote-tracking branch (known changes). If yes, a force push will be performed. Otherwise it will be rejected. Since git does not have remote-tracking tags, tags cannot be overwritten using this option. This passes --force-with-lease option of git push command. unknown changes - This allows remote repository to accept an unsafe non-fast-forward push. This can cause the remote repository to lose commits; use it with care. This does not check any server commits, so it is possible to lose unknown changes on the remote. Use this option with Include Tags to overwrite tags. This passes the traditional --force option of git push command.

这件事刚刚发生在我身上。

昨天我向我们的主人提出了请求。 我的同事今天正在审查它，发现它与我们的主分支不同步，所以为了帮助我，他将master合并到我的分支。 我不知道他会那样做。 然后我在本地合并master，尝试推它，但是失败了。为什么?因为我的同事合并与主人创建了一个额外的提交，我没有在本地!

解决方案:拉下我自己的分支，这样我就能获得额外的提交。然后把它推回我的远程分支。

在我的树枝上，我真的做了:

git pull
git push

为了确保您的本地分支FixForBug没有领先于远程分支FixForBug，在推送之前拉取并合并更改。

git pull origin FixForBug
git push origin FixForBug

如果你真的担心任何其他方法，这些步骤可以帮助你没有任何困难

1:将您的更改保存在您想要推送的本地分支中

2:重命名你的本地分支为未来的备份

3:从你的远程创建一个同名的分支，它将有所有的更改

4:签出这个新分支作为你的新本地分支

5:在这个分支中进行并保存更改

6:承诺和推动

我帮助下:

git stash
git pull origin master
git apply
git commit -m "some comment"
git push

如果你使用TortoiseGit推送对话

引用来源:https://tortoisegit.org/docs/tortoisegit/tgit-dug-push.html#id692368

known changes - This allows remote repository to accept a safer non-fast-forward push. This can cause the remote repository to lose commits; use it with care. This can prevent from losing unknown changes from other people on the remote. It checks if the server branch points to the same commit as the remote-tracking branch (known changes). If yes, a force push will be performed. Otherwise it will be rejected. Since git does not have remote-tracking tags, tags cannot be overwritten using this option. This passes --force-with-lease option of git push command. unknown changes - This allows remote repository to accept an unsafe non-fast-forward push. This can cause the remote repository to lose commits; use it with care. This does not check any server commits, so it is possible to lose unknown changes on the remote. Use this option with Include Tags to overwrite tags. This passes the traditional --force option of git push command.