Re: [Monotone-devel] merge conflicts

[Thomas Keller]

Am 03.12.09 17:26, schrieb Mando Rodriguez:
> Should clarify that when I say "manual" merge I mean there was a
> conflict I need to resolve with an editor. The cronjob performs its
> own pull and then update on the code without intervention from a user.
> 
> The revisions
> 
> 17a20983dff48ab6592fba5ea5335a9495439bad
> 1e2df9bf2ac9e6d5a742f40e409a46f19234ba2f
> 298180715587bb2ee62b04a5a219cabf767282cf
> 
> are the odd ones where it seems to merge the same thing.

I finally had the time to take a closer look at this - this graph of
your "0" branch created monotone-viz for me:

http://picpaste.com/mergefest.png

The three purple circles are the three revisions above and all three are
valid. Something like this usually happens if a developer mostly pushes
and merges local changes but forgets to pull and merge foreign changes
more often. Thus a simple divergence leads to this kind of "merge"
chaos. Luckily merging this is a no brainer with monotone - just call
mtn merge often enough until you're left with only one head.

Thomas.

-- 
GPG-Key 0x160D1092 | address@hidden | http://thomaskeller.biz
Please note that according to the EU law on data retention, information
on every electronic information exchange might be retained for a period
of six months or longer: http://www.vorratsdatenspeicherung.de/?lang=en

signature.asc
Description: OpenPGP digital signature