Re: [Gnu-arch-users] merge trouble

[Aaron Bentley]

Tom Lord wrote:
> Will you please elaborate?   Without referring to old conversations
> we had long ago: what is wrong with the `--forward' option?

Its granularity is too large.  It either applies the entire patch, or 
ignores the entire patch.  It doesn't just ignore already-applied hunks.

I'm going by what ddaa said.  I haven't tested it, but I thought there 
was consensus.

http://lists.gnu.org/archive/html/gnu-arch-users/2004-09/msg00376.html

Aaron