git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Question: next, master and pu branches

From
Shawn O. Pearce <spearce@spearce.org>
Date
Feb 2, 2007, 06:57 UTC
Message-ID
<20070202065735.GA20832@spearce.org>
In-Reply-To
<200702021254.44992.litvinov2004@gmail.com>
Alexander Litvinov <litvinov2004@gmail.com> wrote:
Show 8 quoted lines
> > 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.
Previous: Alexander LitvinovNext: Junio C Hamano
Message 4 of 6 in “Question: next, master and pu branches”
  1. Alexander LitvinovFeb 2, 2007
  2. Shawn O. PearceFeb 2, 2007
  3. Alexander LitvinovFeb 2, 2007
  4. Shawn O. PearceFeb 2, 2007
  5. Junio C HamanoFeb 2, 2007
  6. Alexander LitvinovFeb 2, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.