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

'git resolve'

From
TGThomas Glanzmann <sithglan@stud.uni-erlangen.de>
Date
May 18, 2005, 18:50 UTC
Message-ID
<20050518185018.GE4738@cip.informatik.uni-erlangen.de>

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
Message 1 of 1 in “'git resolve'”
  1. Thomas GlanzmannMay 18, 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.