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

Re: "git rm" is not a valid merge resolution?

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Mar 21, 2011, 18:35 UTC
Message-ID
<vpqpqpk724l.fsf@bauges.imag.fr>
In-Reply-To
<4D879882.4070608@gmail.com>
Piotr Krukowiecki <piotr.krukowiecki@gmail.com> writes:
Show 7 quoted lines
> Hi,
>
> git-status shows a hint that says
>     use "git add/rm <file>..." as appropriate to mark resolution
>  
> But if I "git rm file" the file gets deleted. Is this really the 
> appropriate merge resolution?

In most cases, no, but when you have a modify/delete conflict for example, "git rm" is one of the candidates to resolve the conflict. The hint gives the general case.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Piotr KrukowieckiNext: Piotr Krukowiecki
Message 2 of 6 in “"git rm" is not a valid merge resolution?”
  1. Piotr KrukowieckiMar 21, 2011
  2. Matthieu MoyMar 21, 2011
  3. Piotr KrukowieckiMar 21, 2011
  4. Junio C HamanoMar 21, 2011
  5. Piotr KrukowieckiMar 21, 2011
  6. Junio C HamanoMar 21, 2011

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.