From: Brett Simmers <swtaarrs@gmail.com>
Date: Mon, 10 Nov 2008 19:11:29 GMT
Subject: Re: force a merge conflict
Message-ID: <e32b7bb40811101111o8c4334dj49a0c56c6dac6d15@mail.gmail.com>
In-Reply-To: <81bfc67a0811091219t393ab1faj8d1c4df6de3c260c@mail.gmail.com>

> 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.

If you want to be given a chance to edit the result before the merge
commit, you probably want 'git merge --no-commit'.

-Brett