我正尝试将一个提交推送给原始主服务器。不过,我得到一个错误,说我首先需要获取然后合并,但是我得到这个错误后拉。任何想法,将不胜感激。尝试推送一次提交时发生git错误
[email protected] /e/Work/MH (master)
$ git pull
remote: Counting objects: 27, done.
remote: Compressing objects: 100% (11/11), done.
remote: Total 14 (delta 8), reused 0 (delta 0)
Unpacking objects: 100% (14/14), done.
From file:///V:\
930430f..3a55dca master -> origin/master
Auto-merging project/src/main/java/com/company/project/outgoing/HttpsCallService.java
Merge made by the 'recursive' strategy.
.../java/com/company/project/auth/BcagHmacGenerator.java | 2 +-
.../com/company/project/outgoing/HttpsCallService.java | 16 ++--------------
deployLocal.sh | 2 +-
3 files changed, 4 insertions(+), 16 deletions(-)
[email protected] /e/Work/MH (master)
$ git push origin 72ba712:master
To file:///V:\
! [rejected] 72ba712 -> master (non-fast-forward)
error: failed to push some refs to 'file:///V:\'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
这里提交的名单,而不是72ba712位置:
[email protected] /e/Work/MH (master)
$ git lol
* eec2ab2 (HEAD, master) Merge branch 'master' of file:///V:\
|\
| * 3a55dca (origin/master) <comments>
* | 72ba712 <comments>
* | bc55eb5 <comments>
* | c2aa448 Merge branch 'master' of file:///V:\
|\ \
| |/
| * 930430f <comments>
* | fc7a55b <comments>
* | fd401a5 <comments>
你肯定没人推你'git的pull'和你之间的新承诺'git push'?如果存储库中有很多活动,这确实可能发生。 –
是的,它只是我们中的两个,而其他家伙的电脑都是原产地。他坐在我旁边,并没有改变,因为拉。 – user2569831
您不只是推单提交,特别是当它们不在分支的顶端时。您推送一个或多个包含要推送的提交的分支。 – twalberg