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

Re: Question: next, master and pu branches

From
ALAlexander Litvinov <litvinov2004@gmail.com>
Date
Feb 2, 2007, 06:54 UTC
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 ?

Previous: Shawn O. PearceNext: Shawn O. Pearce
Message 3 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.