[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Merge deleted/added files with the same name

From: Wink Saville <wink_at_saville.com>
Date: 2006-08-12 18:18:30 CEST

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?


Wink Saville

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Aug 12 18:19:41 2006

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.