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

Merge conflict.

From
KJKenneth Johansson <ken@canit.se>
Date
Aug 13, 2005, 14:45 UTC
Message-ID
<pan.2005.08.13.14.45.32.401071@canit.se>

I used cogito to do a cg-update and got conflicts and the exact files are printed to the screen. But say I somehow lost that output is there anyway to list conflicting files ??

cg-status shows the files as modified but that also includes non conflicting files.

The best I could find was to do a "git-update-cache --refresh" but that still do not tell me if I already have removed the conflict in the file.

Is this not something that needs to be answered if we ever are going to have a graphical merge tool?

Next: Petr Baudis
Message 1 of 2 in “Merge conflict.”
  1. Kenneth JohanssonAug 13, 2005
  2. Petr BaudisAug 13, 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.