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

Re: [PATCH] git-revert with conflicts to behave as git-merge with conflicts

From
LTLuben Tuikov <ltuikov@yahoo.com>
Date
Oct 13, 2006, 00:31 UTC
Message-ID
<20061013003120.98769.qmail@web31813.mail.mud.yahoo.com>
In-Reply-To
<7vvempjcwy.fsf@assigned-by-dhcp.cox.net>
--- Junio C Hamano <junkio@cox.net> wrote:
Show 12 quoted lines
> Luben Tuikov <ltuikov@yahoo.com> writes:
> 
> >> If you rely on MERGE_MSG then you would need to clean it after
> >> commit is done.  Currently it does not and checks MERGE_HEAD,
> >> and cleans up MERGE_HEAD when it is done.  MERGE_MSG is not
> >> cleaned.
> >
> > It is cleaned in the lines of the patch you deleted, the section
> > just after the "elif" above:
> 
> Ok, so I can apply that original one with your 'Oops' rolled
> into one patch?
Yes please.
    Luben
Previous: Junio C Hamano
Message 5 of 5 in “git-revert with conflicts to behave as git-merge with conflicts”
  1. git-revert with conflicts to behave as git-merge with conflictsLuben Tuikov, Oct 12, 2006
  2. Junio C HamanoOct 12, 2006
  3. Luben TuikovOct 12, 2006
  4. Junio C HamanoOct 13, 2006
  5. Luben TuikovOct 13, 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.