j
k
j a
j l
svn up svnmerge ... conflicts svn revert -R . svn up svnmerge ... same conflicts
Ah. In the 3.0 branch, always do "svn revert ." after svnmerge. It's ok (Nick says it isn't exactly ok, but I don't understand why) Martin
Back to the thread
Back to the list