Re: [PATCH 12/18] Documentation: Preliminary docs on 'git notes merge'

From: Stephen Boyd <bebarino@gmail.com>
Date: Oct 2, 2010, 08:55 UTC
Message-ID: <4CA6F385.7030207@gmail.com>
In-Reply-To: <1285719811-10871-13-git-send-email-johan@herland.net>

On 09/28/2010 05:23 PM, Johan Herland wrote:

> ++
> +If conflicts arise (and a strategy for automatically resolving
> +conflicting notes (see the -s/--strategy option) is not given,
> +the merge fails (TODO).

Unbalanced '(' here. Can you just drop the first one?

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