Discussion about merging

[Nathaniel Smith]

Aaron Bentley <aaron.bentley <at> utoronto.ca> writes:
> John A Meinel wrote:
> | What about merges from 3rd parties. eg. tree-a merges a patch from
> | tree-c, as does tree-b, when you merge tree-a => tree-b, you *don't*
> | want to merge the patch from c.
> 
> That's a mesh-merge problem.  And as you may have noticed, mesh-merge
> sometimes becomes mess-merge.
> 
> But the technique, AIUI it is:
> 1. Find the set intersection of all the merges of both trees.
> 2. Find the non-cherry-pick merge that has merged everything else in the
> ~ set intersection.

If you use (precise) codeville-merge, these problems simply don't arise.  Just
take the two things you want to merge and merge them; this sort of thing will
work out.

-- Nathaniel