Conflict resolution workflow

[Barry Warsaw]

On Dec 18, 2009, at 09:25 AM, Ben Finney wrote:

>(Something strange is up with your From field, Barry. Can you remove the
>parenthetical redundancy?)

That's claws doing something weird with 'Redirect' which was the closest thing
I could find to 'resend this message sitting in my sent folder to a different
mailing list'.  Sorry about that.

>Barry Warsaw <barry at canonical.com> (by way of Barry Warsaw
><barry at canonical.com>) writes:
>
>> I would like to split this task into two parts. I want a revision that
>> is the results of the merge of trunk, and a separate revision that
>> includes just my changes to resolve the conflict.
>
>What does “the result of a merge of trunk” mean here? Are you saying you
>want a revision, committed to the branch, which includes conflict
>markers and ‘foo.BASE’, ‘foo.THIS’, ‘foo.OTHER’ files? That those should
>appear as part of the branch history?

It's a good question; I'm not sure!  In a perverse way it makes some sense.
Let's say I do the trunk merge on my desktop but want to resolve the conflicts
on my laptop while I'm traveling.  Having everything I'd need to push a
conflicting branch, pull it and work on it elsewhere sure would be handy.

-Barry

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20091217/1d088881/attachment-0001.pgp