HI!
I am merging the diff between branch A and branch B to a working copy of
branch C.
Now I get a tree conflict for some files. TortoiseSVN 1.6.12 says "The
last merge operation tried to delete/move/rename the file 'name', but it
was already edited."
I also get a tree conflict, if I do the merg
HI!
We have the problem, that the svnserve.exe process crashes when doing a
pretty large commit.
It seems to allocate 700 MB memory and then it crashes with "can't
create thread".
Using svnserve.exe 1.5.5. The machine has 6 GB memory.
Any hints would be greatly appreciated.
Thanks!
Thomas
