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

Re: resolving merge conflicts?

From
Junio C Hamano <junkio@cox.net>
Date
May 27, 2005, 03:55 UTC
Message-ID
<7vekbt2uhm.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<429698A0.1020008@pobox.com>
>>>>> "JG" == Jeff Garzik <jgarzik@pobox.com> writes:

JG> So is there a doc or something that describes how to resolve merge JG> conflicts?

JG> Presumably I look at .merge_file_*, and make sure that all necessary JG> changes make it into the copy of the file in the working JG> directory... then what? How to continue the merge?

Then you would copy that .merge_* into the target file, and say
    git-update-cache $that_path

If your merge decision says to remove that file, then making sure you do not have that file, you say

    git-update-cache --remove $that_path
Previous: Jeff GarzikNext: Linus Torvalds
Message 2 of 4 in “resolving merge conflicts?”
  1. Jeff GarzikMay 27, 2005
  2. Junio C HamanoMay 27, 2005
  3. Linus TorvaldsMay 27, 2005
  4. Thomas GlanzmannMay 27, 2005

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.