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

Re: [StGit PATCH] Print conflict details with the new infrastructure (bug #11181)

From
Karl Hasselström <kha@treskal.com>
Date
Dec 4, 2008, 09:30 UTC
Message-ID
<20081204093011.GA25060@diana.vm.bytemark.co.uk>
In-Reply-To
<20081203213813.9924.62751.stgit@localhost.localdomain>
On 2008-12-03 21:38:13 +0000, Catalin Marinas wrote:
> The patch modifies the IndexAndWorkTree.merge() function to display
> pass the conflict information (files) when raising an exception. The
> logic is similar to the one in the old infrastructure.
Looks good. Thanks.
> Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Acked-by: Karl Hasselström <kha@treskal.com>
-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle
Previous: Catalin Marinas
Message 2 of 2 in “Print conflict details with the new infrastructure (bug #11181)”
  1. Print conflict details with the new infrastructure (bug #11181)Catalin Marinas, Dec 3, 2008
  2. Karl HasselströmDec 4, 2008

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.