I'm permanently having the same situation over and over and no idea what's causing it.
I'm working in Eclipse and I'm doing a series of changes. Usually the adaptations of the build script (need to be tested in CI after commit) or updating documentation. This is a series of commit from a single user (me) in the short period of time.
After some number of commits, which looks pretty random, I'm getting the message, that I can't push because there are remote commits, and when I pull, I have self-conflict with my own changes. There was no a single commit other than those that I've made from Eclipse.
Is it a persistent bug in Eclipse, or I'm doing something wrong? I push every single commit.