On Mon, Feb 25, 2008 at 03:56:49AM -0600, Manoj Srivastava wrote: > No, it does not. If branch A has > pi = 2.34567; > and branch B has > pi = 3.14159; > > No matter how much quilting you do you cannot reconcile the > fundamental conflict in the final. Either pi is 3.14159; or it is not; > and if branch A requires pi not to be that value, and branch B requires > pi to be that value, quilt can't make C be quantum like and have the > value be both.
Feature branches don't magically allow you to avoid merge conflicts either, so this is a red herring. Once you've resolved the conflict, then it becomes just another change. This change can become a diff in a stack of diffs. - David Nusinow -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
