From: Elijah Newren Date: Mon, 06 Sep 2010 15:20:51 GMT Subject: Re: cherry-picking a commit clobbers a file which is a directory in the target commit Message-ID: In-Reply-To: <4C84B948.9040907@letterboxes.org> On Mon, Sep 6, 2010 at 3:50 AM, Nick 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