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

Re: Necessity of "evil" merge and topic branches

From
Junio C Hamano <junkio@cox.net>
Date
May 18, 2006, 06:44 UTC
Message-ID
<7vu07n6dds.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<7vy7wz6e8c.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> writes:
> Now, unlike "pu", I never rewind "next", so once I did this
> "evil merge", I do not have to worry about this anymore while
> the topic is still on "next".

Side note. If an evil merge or other hand resolution needs to be done on a path that results in automerge conflicts, rerere often helps. I really should start advertising it a bit more.

Unfortunatly, rerere does not even kick in in this case.
Previous: Junio C Hamano
Message 3 of 3 in “Remove old "git-add.sh" remnants”
  1. Linus TorvaldsMay 18, 2006
  2. Necessity of "evil" merge and topic branchesJunio C Hamano, May 18, 2006
  3. Junio C HamanoMay 18, 2006

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.