From: Caleb Cushing Date: Tue, 11 Nov 2008 17:24:03 GMT Subject: Re: force a merge conflict Message-ID: <81bfc67a0811110924y5ff6a669kee5cb33c92c6046d@mail.gmail.com> In-Reply-To: <85647ef50811110914w7e1d36afh23b43b44ba0e2cf3@mail.gmail.com> > Is not the following option of the merge just for it? > > --no-commit > Perform the merge but pretend the merge failed and do not > autocommit, to give the user a chance to inspect and further tweak the > merge result before committing. yes and no... it doesn't auto-magically allow me to do what a merge conflict does. which is put together a diff. all it really did was not commit the auto merge. as far as --no-ff I'm not saying it commits the same way but I didn't see any difference in the resulting diffs, which, imho, all that matters is whether the resulting merged code is correct. -- Caleb Cushing