Merging git notes when there are merge conflicts in them

Question

I did the following to merge Git notes.
ref : http://vmiklos.hu/blog/git-notes-merge

I cloned a repo, added notes reference to the commit (refs/notes/commits).

Answer 1

Note: git 2.6 (Q3/Q4 2015) will make git notes merge a bit more efficient and precise:

See commit 4f655e2, commit d2d68d9, commit 11dd2b2, commit 93efcad, commit 4d03dd1, commit e48ad1b (17 Aug 2015) by Jacob Keller (jacob-keller).
^{(Merged by Junio C Hamano -- gitster -- in commit 5b6211a, 31 Aug 2015)}

notes: teach git notes about notes..mergeStrategy option

Teach notes about a new "notes..mergeStrategy" option for configuring the notes merge strategy when merging into refs/notes/.
This option allows for the selection of merge strategy for particular notes refs, rather than all notes ref merges, as user may not want cat_sort_uniq for all refs, but only some.
Note that the is the local reference we are merging into, not the remote ref we merged from. The assumption is that users will mostly want to configure separate local ref merge strategies rather than strategies depending on which remote ref they merge from.

notes..mergeStrategy overrides the general behavior as it is more specific.