I've got back to this patch and made a separate --skip-conflicts option.
I've concluded that the option should be mutually exclusive with other
conflicts options, but unfortunately we don't seem to have any
infrastructure for doing this, so I have not done so yet [it doesn't
really make things any worse: --mark-conflicts and
--dont-allow-conflicts already have the same problem :-(].
This is probably something we can address in general with Neil's library.
Mon Oct 26 18:19:17 GMT 2009 Ganesh Sittampalam <email@example.com>
* Resolve issue1588: add --skip-conflicts option
This option is for both pull and apply, and causes any patches that would
cause conflicts to be skipped, either in interactive selection or by --all.