Merging and Ancestry
From: Lakshman Srilakshmanan <lakshman.srilakshmanan_at_tradingpost.com.au>
Date: 2006-08-17 10:37:36 CEST
Hi All,
I have
/branch/A
Scenario 1
Project in Branch A merged their work into trunk.
When Project in Branch B tried to merge their work into trunk we got a
Scenario 2
Project in Branch A merged their work into trunk.
Project in Branch B merged their work into trunk and all was fine.
I believe in Scenario 2 Subversion realised that test.txt was an
The problem I have is, Scenario 2 being the correct process, how do I
Is there an alternate way ?
Thanks
---------------------------------------------------------------------
|
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.