1

I have a problem with Eclipse and EGit.

I have a file that has some conflicts. I tried to merge it manually, and after this operation I tried to click "mark as merged".

So I pull, but the pull doesn't have any effect.

What do I have to do?

RamenChef
  • 5,557
  • 11
  • 31
  • 43
Alessandro C
  • 3,310
  • 9
  • 46
  • 82

1 Answers1

0

"Mark a merged" means the file is locally modified.

If the pull was done before, a new pull won't do anything (the remote code was already fetched), and the conflicted merge has just been resolved.

You should add that file to the index, commit and push, not pull.
See "How to resolve conflicts in egit" as an example.

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • but add to index does not make effects, the file still remains marked as a conflict. Furthermore, I have some other new files that are to be pulled, but egit does not pull them. – Alessandro C Mar 31 '16 at 07:32
  • @AlessandroC If you remove the merge markers inside that file, it won't be marked as a conflict anymore – VonC Mar 31 '16 at 07:33