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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Thu Dec 08 20:30:28 2005
This archive was generated by hypermail 2.1.8 : 2005-12-08 20:30:34 EST