[Gnu-arch-users] Re: --skip-present implemented

[Miles Bader]

Tom Lord <address@hidden> writes:
> One issue is that star-merge should probably have a --forward option.
> That would actually eliminate many spurious conflicts in cases like
> this.

... but please don't call it `--forward'.  Use something memorable like
`--ignore-duplicate-hunks' (note that in patch, --forward has _two_
effects, it ignores duplicate hunks, but it also ignores `apparently
reversed' patches; I would guess that tla should not do the latter).

I presume this would an option to dopatch (and thus all the various
merging commands), right?

-Miles
-- 
"Whatever you do will be insignificant, but it is very important that
 you do it."  Mahatma Gandhi