On 11:59 AM, Elijah Newren wrote: > btw, does anyone know how to force > git apply to proceed and add conflict markers if necessary rather than > just bailing out? It's not quite the same, and you probably already know about it, but there's always: git apply --reject -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html