Re: Wine + GIT

From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Dec 8, 2005, 09:29 UTC
Message-ID: <20051208092945.GA4921@c165.ib.student.liu.se>
In-Reply-To: <20051208073000.7097.qmail@science.horizon.com>

On Thu, Dec 08, 2005 at 02:30:00AM -0500, linux@horizon.com wrote:

> (Grump... I just noticed that the "recursive" merge stratgy *doesn't*
> generate a merged file containing conflict markers, at least not in
> the case I tried.  Instead I get "a~HEAD" and "a~branch" files.
> Time to fix the docs...)

In the most common case, i.e., when you have a file 'a' in the common ancestor and 'a' have been modified in both A and B (where A and B are the branches we are going to merge) then the recursive strategy should generate a merged file with merge(1), which will produce conflict markers if there are conflicts. Any other behaviour is a bug.

However, in some other cases such as rename/rename, file/directory and add/add conflicts "a~A" and "a~B" will be created in the working directory. The recursive strategy will (or, is supposed to) tell you about such things, though.

- Fredrik