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? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html