SVN merge loses files and code
Posted
by SyBer
on Stack Overflow
See other posts from Stack Overflow
or by SyBer
Published on 2010-04-03T19:46:27Z
Indexed on
2010/04/03
19:53 UTC
Read the original article
Hit count: 481
Hi.
I'm trying to merge trunk change-set into a branch, but have found out a lot of post-merge issues, including whole files that disappeared, and missing code blocks
I'm using SVN 1.6 for both clients and server. Tried this with multiple clients - Eclipse, Netbeans and SVN - the result is the same.
Can someone advice how sort it out, and most important, prevent code loss?
Thanks in advance!
© Stack Overflow or respective owner