Re: kha/safe and kha/experimental updated

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Dec 19, 2007, 15:38 UTC
Message-ID: <b0943d9e0712190738o66005233v1ee908427ae619b8@mail.gmail.com>
In-Reply-To: <b0943d9e0712180809l4d2d01b8j32ab2a410885cc5e@mail.gmail.com>

On 18/12/2007, Catalin Marinas <catalin.marinas@gmail.com> wrote:

Show 5 quoted lines

> On 18/12/2007, Karl Hasselström <kha@treskal.com> wrote:
> >       Fix "stg resolved" to work with new conflict representation
>
> For some reason, the interactive resolving keeps invoking the merger.
> I'll have a look.

I found the problem. git.ls_files() now returns all three stages if there was a conflict and the file list got longer. I added a set to remove the duplicates.

-- 
Catalin

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