Re: Merge of deleted file with a modified one
From: Paul Koning <pkoning_at_equallogic.com>
Date: 2006-01-10 02:19:19 CET
Maybe I'm missing something, but it seems to me this issue is really
A conflict occurs whenever two file have changed from their common
In such a case, the situation is called a conflict in order to force
I think this logically leads to the following design principle for
- If there is a merge situation where one could argue that either of
And no, "review the merge output" is NOT a valid answer in this sort
paul
---------------------------------------------------------------------
|
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.