From: Dilip M <dilipm79@gmail.com>
Date: Sat, 27 Mar 2010 17:22:25 GMT
Subject: Re: force "unmerged" for same-file auto-merges
Message-ID: <c94f8e121003271022v2b30ef52j3bd4015f12938f7a@mail.gmail.com>
In-Reply-To: <hoh16f$koe$1@dough.gmane.org>

On Fri, Mar 26, 2010 at 6:34 AM, Neal Kreitzinger <neal@rsss.com> wrote:

> In other words, when two people modify the same file in different places I
> want the automerge results file, but I want the resulting file marked as
> unmerged so the programmer can then run git-mergetool to review the merge
> results.  This also prevents the programmer from running git-commit
> immediately after the automerge without reviewing the merge results.  Can
> "mark automerge of samefile as 'unmerged'" be done in git via config
> settings or command options?

What about merge with '--no-commit' option and than doing 'diff --cached'. You
have option of still seeing what merged and decide to reset or commit.

-- 
Dilip