Hi Junio, On Sun, Mar 11, 2012 at 12:18, Junio C Hamano <gitster@xxxxxxxxx> wrote: > suvayu ali <fatkasuvayu+linux@xxxxxxxxx> writes: > >> ... is that discussion on progit talking about >> something else? > > Sorry, I do not read or write progit, so I do not know offhand what > it says in the section you read and I cannot judge if it was you who > misread, or if it was book that misspoke. > Okay, thanks. I'll switch back to the tried and tested, $ git merge -s ours I'll take up the progit issue on the relevant discussion boards. -- Suvayu Open source is the future. It sets us free. -- 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