Re: [Gnu-arch-users] Partial update

[Aaron Bentley]

Jan Hudec wrote:

> > star-merge is superset of update.

I used to think so, but it's not accurate when you look at trees that 
have deliberately diverged.  Star-merge will throw away local changes 
that were rejected by the other branch, and merge the two as closely as 
possible.

Update, on the other hand, will retain local changes, and apply any 
changes from the other tree since the last merge from other.

This is why Fai supports "merge --update".  It also supports "merge 
--update --diff3".

Aaron

--
Aaron Bentley
Director of Technology
Panometrics, Inc.