Strategy accordingly:</p>
</div>
<div class="paragraph">
<p>"ours" automatically resolves conflicting notes in favor of the local
version (i.e. the current notes ref).</p>
</div>
<div class="paragraph">
<p>"theirs" automatically resolves notes conflicts in favor of the remote
version (i.e. the given notes ref being merged into the current notes
ref).</p>
</div>
<div class="paragraph">
<p>"union" automatically resolves notes conflicts by concatenating the
local and remote versions.</p>
</div>
<div class="par