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

Re: conflict status

From
Sverre Rabbelier <srabbelier@gmail.com>
Date
Aug 3, 2009, 17:37 UTC
Message-ID
<fabb9a1e0908031037t16a828f6h4de9fb11bcc957fe@mail.gmail.com>
In-Reply-To
<DDAD985F-C9CA-4159-B382-354D4B082C19@users.sourceforge.net>
Heya,
On Mon, Aug 3, 2009 at 08:14, Michael Wild<themiwi@users.sourceforge.net> wrote:
> 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/...
Try 'git status' :),
-- 
Cheers,

Sverre Rabbelier
Previous: Michael WildNext: Thomas Rast
Message 2 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.