threads / discuss / 652

'git resolve'

Subject: 'git resolve'

## tl;dr

One message between May 18, 2005 and May 18, 2005.

replies: 0people: 1as markdown or json

Thomas Glanzmann· May 18, 2005, 18:50 UTC · lore

Hello, has someone out there an git-resolve script? Which guides the user tot he process of stuff that is not handeled the autmatic merge or the threeway merge?

	Thomas

$ 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.