Search code examples
eclipsesvnsubversive

Diff markup present in merged file

In the Synchronize view, I right click the conflicted file then select Edit Conflict. Once I'm done merging the files, I right click the file and select Mark Merged.

However, when I open the file in the PHP perspective, I still see the diff markers:

<<<<<<< .working
...
=======

I then proceed to get rid of them before commiting my code. There has to be a better way... what am I doing wrong?

Solution

  • Started using TortoiseSVN for merge operations.