From: Alexander Litvinov <litvinov2004@gmail.com>
Date: Fri, 02 Feb 2007 06:54:44 GMT
Subject: Re: Question: next, master and pu branches
Message-ID: <200702021254.44992.litvinov2004@gmail.com>
In-Reply-To: <20070202060030.GA20442@spearce.org>

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