Re: [Gnu-arch-users] Re: identical changes conflict

[Aaron Bentley]

Catalin Marinas wrote:
> the common ancestor for a three-way merge was the latest
> common patch between the two trees. This means that it won't work well
> with cherry-picking.

This has not changed.  To handle situations where OTHER has 
cherry-picked from THIS, you might want to try baz merge.

> Has this been changed recently? I think that if the common ancestor
> would be the last consecutive common patch, star-merge should not
> report a conflict for cherry-picked patches since the changes are
> identical (well, some extra assumptions here).

The problem with star-merge isn't conflicts.  It's that cherry-picks are 
interpreted as rejecting anything between the cherry-pick and the last 
real merge.

Aaron
--
Aaron Bentley
Director of Technology
Panometrics, Inc.