On Mon, Sep 6, 2010 at 3:50 AM, Nick <oinksocket@xxxxxxxxxxxxxxx> wrote: > I've been Warnocked. Can anyone point me in the right direction? It's a bug in the recursive merge strategy (i.e. the default one), and affects current master as well as 1.7.0.4. The resolve strategy (which can be used with cherry-pick since 1.7.2) handles this correctly: $ git cherry-pick --strategy=resolve branch1 Trying simple merge. Simple merge failed, trying Automatic merge. [master e95e377] added falafel 0 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 falafel I'll investigate. Elijah -- 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