0

Suddenly, I have started to get the non-fast-forward rejected in Egit. I have tried to do this solution, but it helped only once, after this, when I'm doing more changes in the local - although the remote didn't changed - I'm getting again the annoying rejected-not-fast-forward

enter image description here

Then I must again to merge the branch with the remote. I think it's not should be acting like that.

Does someone have an idea?

lingar
  • 477
  • 1
  • 7
  • 25
  • 1
    Do you understand the general reason for *why* this message happens? In short, it's because your _local_ and _remote_ branches have "diverged" - they each have changes that the other one does not have. Once you understand what that means, you can try to debug why its happening in your case. Without any access to your local and remote history, it's hard for anyone else to do more than guess about your exact scenario. – IMSoP Oct 27 '21 at 14:35
  • 1
    More specifically, does this answer your question? [What does "Git push non-fast-forward updates were rejected" mean?](https://stackoverflow.com/questions/4684352/what-does-git-push-non-fast-forward-updates-were-rejected-mean) – IMSoP Oct 27 '21 at 14:59
  • 1
    EGit is here the messenger you shoot. – howlger Oct 27 '21 at 15:38
  • @IMSoP thanks, I knew it, but after I pulled and merged once, I though it should be OK from now on – lingar Oct 28 '21 at 06:50
  • 1
    The message comes from the server: your commit is not based on the last commit (someone else pushed something in the meantime). And because the server is configured not to allow fast-forward (which can be changed), your push is rejected. So you have to do a _pull_ first. – howlger Oct 29 '21 at 16:28

0 Answers0