Merge behavior question

[Matt Mackall]

On Thu, 2008-10-16 at 19:51 -0500, Sean Kelley wrote:
> Hi,
> 
> I have probably a basic question on merges, so please suffer my lack
> of knowing the obvious here.  But what determines on a merge what
> order of precedence is taken?  If after I clone a repo someone else
> pushes a change to remove a header, but in my clone I still need the
> header and so do not remove it, then I would assume by order of
> operation I need to do something to keep my include line in my change.

If you've got versions a1 and a2 both derived from common ancestor a,
when you merge, the resulting a' should contain all changes in a->a1 and
a->a2.

So yes, changes such as you describe will require some manual inspection
or testing after a merge.

In practice, such changes usually result in conflicts that require
manual resolution, so they usually don't sneak by unnoticed.

-- 
Mathematics is the supreme nostalgia of our time.