resolving conflicts an push reproduce same conflicts again
<p>So I worked all day on a new feature in my project and after I finished it, I wanted to upload my local commits into the repository.</p>

<p>When I tried to push my commits to the git repository, that push was rejected because of some merge conflicts. So I went through the files, choosing "mine" or "theirs" for every conflict. After I was done with that, git didn't tell me anything about wether I had to do something more or not. Since I had resolved all conflicts I went on and tried to push again, ending up with the same conflicts I had to solve just before. (I could do that over and over again if I wanted to become insane)</p>

<p>I'm failing in trying to work properly with this tool for some months now.</p>

<p>Pull data. Work work. Commit work. Push. Eventually merge conflicts. Push again. Done. - This is how I had expected git to work but that seems not to be the case. So what steps am I missing? What do I have to do in order to not using up hours after hours reading tutorials like <a href="http://githubtraining.com/fix-merge-conflict-git-using-sourcetree/" rel="noreferrer">these</a> that still don't solve my problems as they stop right after solving the conflicts?</p>

<p>Oh, and I am using git via PhpStorm 10.</p>