Pros:
Kinda pros:
git notes merge -s union does the union merge that is proposed for the possible future version of the spec. But that merge strategy is easy to do for our use case with sort | uniq anyway.
Cons:
git notes append adds newlines that have to be filtered out (git-signatures filters in the client, but we can also filter out after append with git notes edit).
- Satisfying this spec (ordering) seems a bit hard when having conflicts.
- Doesn't allow
stage-commit workflow I would like to have.
- It doesn't make much sense to call those "notes", really, as you can't read those
notes in git-log without decoding them with git-wotr first anyway.
I think we want the same approach, but implemented via git builtins.
Pros:
Kinda pros:
git notes merge -s uniondoes the union merge that is proposed for the possible future version of the spec. But that merge strategy is easy to do for our use case withsort | uniqanyway.Cons:
git notes appendadds newlines that have to be filtered out (git-signaturesfilters in the client, but we can also filter out afterappendwithgit notes edit).stage-commitworkflow I would like to have.notesingit-logwithout decoding them withgit-wotrfirst anyway.I think we want the same approach, but implemented via git builtins.