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

Re: needs merge

From
Junio C Hamano <junkio@cox.net>
Date
Jan 7, 2006, 08:41 UTC
Message-ID
<7v1wzko2f5.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<200601070332.36654.len.brown@intel.com>
Len Brown <len.brown@intel.com> writes:
Show 5 quoted lines
> $ git commit
> my-file needs merge
>
> how do i tell git that there is no merge to do and the (unchanged) working file is what
> i want to keep as the result of the merge?
Do you mean running
    $ git update-index my-file
to mark the path resolved?
Previous: Len BrownNext: Len Brown
Message 2 of 4 in “needs merge”
  1. Len BrownJan 7, 2006
  2. Junio C HamanoJan 7, 2006
  3. Len BrownJan 7, 2006
  4. Junio C HamanoJan 7, 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.