Re: Two people adding the same file - can both versions be merged?
From: Dave Lawrence <dlawrence_at_ad-holdings.co.uk>
Date: 2007-05-09 14:45:13 CEST
You can't merge two files with, what to Subversion is a non existent
developer1 and developer2 both check out rev1 of the file. Both make
1) Take the changes between rev1 and rev2
Easy to do if developer1 and developer2 were editing different parts of
Now the situation you are describing is that effectively there is a
The only merge algorithm that can be applied is that one version
---------------------------------------------------------------------
|
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.