You are viewing a plain text version of this content. The canonical link for it is here.

Posted to users@subversion.apache.org by Wink Saville <wi...@saville.com> on 2006/08/12 16:18:30 UTC

Merge deleted/added files with the same name

I recently attempted to merge from the "trunk" to a "branch",  on the 
"trunk" a set of files had been deleted and new files with the same name 
had been added, the merged failed. I did some research and it appears 
this might be resolved in version 1.4, is that true?

Thanks,

Wink Saville

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org