hich checks out
conflicting notes in a special work tree for resolving notes conflicts
(<code>.git/NOTES_MERGE_WORKTREE</code>), and instructs the user to resolve the
conflicts in that work tree.
When done, the user can either finalize the merge with
<em>git notes merge --commit</em>, or abort the merge with
<em>git notes merge --abort</em>.</p>
</div>
<div class="paragraph">
<p>Users may select an automated merge strategy from among the following using
either -s/--strategy option or configuring notes.merge