*.edited file is created during merge

912 Views Asked by At

I added external merge tool (meld) to subversion on Ubuntu. Everything works fine, however when I resolve my conflict and accept the changes I see file being created that I merged, with ".edited" appended to it. So if I merged file test.txt I would get my merge changes in test.txt and also file created test.txt.edited with merge conflicts.

Does anybody know who creates this file and its creation can be disabled.

1

There are 1 best solutions below

0
On

The file is being created by subversion. See this SO answer.

My guess is it happens when you edit the final file but you end up choosing mine-conflict, theirs-conflict, mine-full or theirs-full.

You can also check this thread.