问题
My Google-fu is apparently weak on this subject, so I'm hoping one of you can help me out! I recently upgraded to Subclipse 1.8, which implements SVN 1.7, and I've noticed that after resolving a merge conflict that it always creates a .edited file. For example, if I resolve a merge conflict on a file named "foo.txt", I am left with "foo.txt" and "foo.txt.edited". What is this .edited file, and is there some way that I can configure SVN or Subclipse to stop generating it?
回答1:
The file is created by Subversion. See: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/merge.c?view=markup
I assume it is a transient file though and does not remain on disk in once you tell SVN the conflicts are resolved. I would encourage you to document a step by step reproduction recipe and report it to Subclipse community.
http://subclipse.tigris.org/ds/viewForumSummary.do?dsForumId=1047
I am assuming this is something where we just need to ask Eclipse to "refresh" after some scenario plays out.
来源：https://stackoverflow.com/questions/13256220/svn-subclipse-creating-edited-file-after-merge-conflict