From: Stephen Boyd <bebarino@gmail.com>
Date: Sat, 24 Jul 2010 08:21:43 GMT
Subject: Re: [WIP/RFC 13/13] Documentation: Preliminary docs on 'git notes merge'
Message-ID: <4C4AA297.4090605@gmail.com>
In-Reply-To: <1279880104-29796-14-git-send-email-johan@herland.net>

  On 07/23/2010 03:15 AM, Johan Herland wrote:
> +-X<strategy>::
> +--resolve=<strategy>::
> +	When merging notes, resolve notes conflicts using the given
> +	strategy. The following strategies are recognized: "manual"
> +	(default), "ours", "theirs" and "union". "ours" automatically
> +	resolves conflicting notes in favor of the local version (i.e.
> +	the current notes ref). "theirs" auto-resolves notes conflicts
> +	in favor of the remote version (i.e. the given notes ref being
> +	merged into the current notes ref). "union" auto-resolves
> +	notes conflicts by concatenating the local and remote versions.
> +

We use both "auto-resolves" and "automatically resolves" in this paragraph. Perhaps it's better to use one term throughout?