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

conflict status

From
Michael Wild <themiwi@users.sourceforge.net>
Date
Aug 3, 2009, 15:14 UTC
Message-ID
<DDAD985F-C9CA-4159-B382-354D4B082C19@users.sourceforge.net>
Hi all

I'm merging two branches with a large number of conflicts. Fortunately, there are many modified/deleted conflicts (locally modified, remotely deleted), and I know that for those I want to pick the deleted version. However, I can't seem to motivate GIT into telling me for which of the conflicting files this is the case. I know that git-mergetool somehow extracts this information, but looking at the code, it seems to me that there must be an easier, user-level method of obtaining this information.

Generally speaking, I would like to know for each file with a conflict  
what it's status is, similar to what SVN does:
- locally modified/created/deleted/...
- remotely modified/created/deleted/...

Please excuse me if this is either trivial or has been answered many times before, but neither perusing the man-pages, nor asking google turned up anything remotely useful.

Thanks for the help
Michael
Next: Sverre Rabbelier
Message 1 of 8 in “conflict status”
  1. Michael WildAug 3, 2009
  2. Sverre RabbelierAug 3, 2009
  3. Thomas RastAug 3, 2009
  4. Junio C HamanoAug 3, 2009
  5. Michael WildAug 4, 2009
  6. Jakub NarebskiAug 4, 2009
  7. Michael WildAug 4, 2009
  8. Junio C HamanoAug 4, 2009

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.