Question

正如你从图片中看到的那样，我的最后4次提交没有被推，因为另一个人在我面前犯了一个提交而我没有拉。现在它说我领先4，落后1。当我试图推动时说：

    To git@XX.XX.XX.XX:compudoc.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'git@XX.XX.XX.XX:compudoc.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. If you did not intend to push that branch, you may want to
hint: specify branches to push or set the 'push.default' configuration variable
hint: to 'simple', 'current' or 'upstream' to push only the current branch.

我该如何解决？

Answer 1

所以你不能在拉前推动。在git pull或git push时输入git push origin master 祝你好运。

Answer 2

你需要拉master，重新定位它然后你可以推。

git fetch origin

git rebase origin/master

git push origin master

按顺序运行这3个，你应该好好去。如果你有重新绑定，它将显示任何合并冲突。

Git推出问题

2 个答案: