git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [WIP/RFC 13/13] Documentation: Preliminary docs on 'git notes merge'

From
Stephen Boyd <bebarino@gmail.com>
Date
Jul 24, 2010, 08:21 UTC
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:
Show 11 quoted lines
> +-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?
Previous: Johan HerlandNext: Johan Herland
Message 21 of 24 in “[WIP/RFC 00/13] git notes merge”
  1. Johan HerlandJul 23, 2010
  2. 01/13 (trivial) notes.h: Minor documentation fixes to copy_notes()Johan Herland, Jul 23, 2010
  3. 02/13 notes.h: Make default_notes_ref() available in notes APIJohan Herland, Jul 23, 2010
  4. 03/13 notes.h/c: Clarify the handling of notes objects that are == null_sha1Johan Herland, Jul 23, 2010
  5. 04/13 notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondJohan Herland, Jul 23, 2010
  6. Jonathan NiederJul 23, 2010
  7. Johan HerlandJul 23, 2010
  8. 05/13 (trivial) t3303: Indent with tabs instead of spaces for consistencyJohan Herland, Jul 23, 2010
  9. 06/13 notes.c: Use two newlines (instead of one) when concatenating notesJohan Herland, Jul 23, 2010
  10. 07/13 (trivial) git notes prune: Accept --verbose in addition to -vJohan Herland, Jul 23, 2010
  11. 08/13 builtin/notes.c: Split notes ref DWIMmery into a separate functionJohan Herland, Jul 23, 2010
  12. 09/13 git notes merge: Initial implementation handling trivial merges onlyJohan Herland, Jul 23, 2010
  13. Stephen BoydJul 24, 2010
  14. Johan HerlandJul 25, 2010
  15. 10/13 builtin/notes.c: Refactor creation of notes commits.Johan Herland, Jul 23, 2010
  16. 11/13 git notes merge: Handle real, non-conflicting notes mergesJohan Herland, Jul 23, 2010
  17. 12/13 git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland, Jul 23, 2010
  18. Stephen BoydJul 24, 2010
  19. Johan HerlandJul 25, 2010
  20. 13/13 Documentation: Preliminary docs on 'git notes merge'Johan Herland, Jul 23, 2010
  21. Stephen BoydJul 24, 2010
  22. Johan HerlandJul 25, 2010
  23. Sam VilainJul 25, 2010
  24. Johan HerlandJul 25, 2010

Read the whole thread, see it on lore, or plain text.

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