From: Caleb Cushing <xenoterracide@gmail.com>
Date: Sun, 09 Nov 2008 20:19:57 GMT
Subject: Re: force a merge conflict
Message-ID: <81bfc67a0811091219t393ab1faj8d1c4df6de3c260c@mail.gmail.com>
In-Reply-To: <20081109183917.GA18415@euler>

> I'm not sure a 'conflict' is what you want, based on what you say below;
>  rather, it seems you simply want to force a 'merge commit', i.e. a commit with
>  multiple parents.

>
> git merge --no-ff ?
>
I tried that but I don't see that it's any different than a fast
forward in this scenario. Actually I don't see any difference between
it and a fast-forward.
-- 
Caleb Cushing