EGit "synchronize workspace" will not mark merge conflict as resolved

Question

So far, I have simply merged with the fetch + merge approach, and if there was a merge conflict, I fixed it manually, installed it, and started it. It resolved just fine.

Now I decided to try to "synchronize the workspace." I check my local branch and run this command on the remote branch of origin. How to transfer individual files to my repository?

I tried using merge or pull, but instead of integrating the change, it unexpectedly tells me that there is a merge conflict. This conflict should not occur in the first place, but indexing and commit again do not fix the error. I synchronize with the workspace and it continues to show a two-sided red error on two identical files ...

Answer 1

Try fetch + rebase instead: you have to resolve the conflict again, but once this is done, your corrected commit should be on top origin/master: the next selection should not do anything, since everything was selected.

See this tutorial :

Answer 2

Synchronize Workspace .

" ". - . . , . "" , . , . .

Team Synchronization. pull ( fetch/merge), , . , . - , , reset --hard .