嘿,弗拉德。我按照你说的做了,我想它起作用了,但在推送命令后,它仍然出现相同的错误。这是我的命令日志。
在git checkout develope之后;
Already on 'develop' Your branch and 'origin/develop' have diverged, and have 2 and 3 different commits each, respectively. (use "git pull" to merge the remote branch into yours)。在git pull之后--> Already up-to-date! Merge made by the 'recursive' strategy. 最后,在推送之后 -->! [rejected] feature/HS-41 -> feature/HS-41 (non-fast-forward) - quartaela
git checkout develope
之后;Already on 'develop' Your branch and 'origin/develop' have diverged, and have 2 and 3 different commits each, respectively. (use "git pull" to merge the remote branch into yours)
。在git pull
之后-->Already up-to-date! Merge made by the 'recursive' strategy.
最后,在推送之后 -->! [rejected] feature/HS-41 -> feature/HS-41 (non-fast-forward) - quartaelagit pull
之后发生了什么? - Vlad Nikitingit pull origin develop
拉取,然后再次执行git push
。如果这不起作用,请给我输出下一个命令的结果:git branch -vv
,git remote -v
,git log --graph --decorate --all
(前50行)。 - Vlad Nikitin