From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 02 Feb 2007 06:57:35 GMT
Subject: Re: Question: next, master and pu branches
Message-ID: <20070202065735.GA20832@spearce.org>
In-Reply-To: <200702021254.44992.litvinov2004@gmail.com>

Alexander Litvinov <litvinov2004@gmail.com> wrote:
> > You can let git-rerere help you to manage conflicts which might
> > reoccur during merges.  If you create the .git/rr-cache directory
> > then git-commit and git-merge will automatically use git-rerere to
> > help you.
> 
> Yes git-rerere is a black magic tool, but it works :-)
> Byt he way, why git-pull (or possible git-merge) does not commit the merge 
> result after conflict was fixed by git-rerere ?

No, it doesn't.  That way you can review the result of the merge
first and verify its indeed correct.

-- 
Shawn.