Git Notes Merge and Strategies

in-progress `git notes merge`, i.e. a notes merge with conflicts. This simply removes all files related to the notes merge. `-q`:: `--quiet`:: When merging notes, operate quietly. `-v`:: `--verbose`:: When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed. DISCUSSION ---------- Commit notes are blobs containing extra information about an object (usually information to supplement a commit's message). These blobs are taken from notes refs. A notes ref is usually a branch which contains "files" whose paths are the object names for the objects they describe, with some directory separators included for performance reasons footnote:[Permitted pathnames have the form 'bf'`/`'fe'`/`'30'`/`'...'`/`'680d5a...': a sequence of directory names of two hexadecimal digits each followed by a filename with the rest of the object ID.]. Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future. It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`. NOTES MERGE STRATEGIES ---------------------- The default notes merge strategy is `manual`, which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with `git notes merge --commit`, or abort the merge with `git notes merge --abort`. Users may select an automated merge strategy from among the following using either `-s`/`--strategy` option or configuring `notes.mergeStrategy` accordingly: `ours` automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref). `theirs` automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref). `union` automatically resolves notes conflicts by concatenating the local and remote versions. `cat_sort_uniq` is similar to `union`, but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the "cat | sort | uniq" shell pipeline to the local and remote versions. This strategy

The git notes command provides options for merging notes, including quiet and verbose modes. The discussion explains how commit notes are stored in notes refs and how their history can be inspected. Additionally, various notes merge strategies are available, including manual, ours, theirs, union, and cat_sort_uniq, which can be used to resolve conflicts between notes.