Hi; It seems to me there is a bug (or at least some missing documentation) for git notes merge --commit. If the working directory is .git/NOTES_MERGE_WORKTREE, then all notes for the conflicting commit are silently dropped. A test script follows. Have I missed something? David P.S. Please CC me, I'm not subscribed. tmpdir=$(mktemp -d) cd $tmpdir git init git commit --allow-empty -m'empty commit' git notes add -m 'foo' HEAD git notes --ref=other add -m 'bar' HEAD git notes merge refs/notes/other cd .git/NOTES_MERGE_WORKTREE echo "foo\nbar\n"> $(git rev-parse HEAD) git notes merge --commit cd ../.. git notes list | wc -l -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html