Re: [Monotone-devel] deferred merge

[Markus Wanner]

On 03/26/2016 04:46 AM, Hendrik Boom wrote:
> Is there some easy oe-time way of asking a merge to be deferred,

Not really, no. Like a commit, this is an atomic operation: either the
resulting revision has one (commit) or two (merge) parents. So you can
only defer the merge completely. That works pretty well and may be
reasonable. For long lived diverges, I usually give one of the branches
a specific name.

> so 
> that the "merged" file has both versions in it, complete with 
> '<<<<<<<<' and ">>>>>>>" and ssuch to mark the conflicts?

Well, you can always commit the file including these markers. However,
they have no special meaning for monotone and things might get messy
with further merges on that same file.

Regards

Markus Wanner