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

From: Johan Herland <johan@herland.net>
Date: Oct 4, 2010, 15:15 UTC
Message-ID: <201010041715.08879.johan@herland.net>
In-Reply-To: <4CA6F385.7030207@gmail.com>

On Saturday 2. October 2010 10.55.33 Stephen Boyd wrote:

Show 7 quoted lines

> 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?

Done. Will be in next iteration.

Thanks,

...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net

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