From: Junio C Hamano <junkio@cox.net>
Date: Tue, 08 Nov 2005 21:41:20 GMT
Subject: Re: Expected Behavior?
Message-ID: <7v7jbig6m7.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20051108210332.GB23265@c165.ib.student.liu.se>

Fredrik Kuivinen <freku045@student.liu.se> writes:

> Jon: You could try to this merge with the recursive merge strategy
> (git merge -s recursive 'merge message' master dev) If you do, you
> _should_ get something like:
>
>     CONFLICT (add/add): File file3 added non-identically in both
>     branches. Adding as file3_master and file3_dev instead.
>
> You will then end up with file3_master and file3_dev in your working
> tree, which corresponds to file3 in the master branch and file3 in the
> dev branch, respectively.

Oops, I missed that part.  This is unsafe in theory, if you
could overwrite existing file3_master or file3_dev.  Does that
matter in practice?