On Thu, May 29, 2008 at 9:49 AM, Michael Droettboom <md...@st...> wrote: > Minor point: On my machine at least, I don't have to manually clean up the > conflict files -- they are removed for me on the next commit. Those files > are really just for reference. If you use a SVN frontend for diffing (such > as psvn.el or meld) they are largely unnecessary. On my machine I do need to manually purge these -- svn commit will fail with a message like johnh@flag:mpl> svn commit -F svnmerge-commit-message.txt svn: Commit failed (details follow): svn: Aborting commit: '/home/titan/johnh/python/svn/matplotlib.trunk/matplotlib/lib/matplotlib/image.py' remains in conflict even if I have manually edited out all the conflicts. I then need to do johnh@flag:mpl> rm lib/matplotlib/image.py.* Maybe one of your emacs modes is helping you out behind the scenes? Can you send me your emacs configs for svn? JDH