Stefan Frühwirth

weiznich, can you elaborate: "The annotations change is cause by our implementation."? I experience strange annotation duplication (even multiplication) when I add an annotation via shell task client, then sync,...

I did not revert any changes. I just set up a test environment and as of now I am not able to reproduce the problem. Sync problems are the worst...

Thank you! I wasn't aware that the git test case would be so simple. Sorry for the extra work.. I guess the fact that that the code starting at line...

Bad news. It looks like merge-tree is something like a proof-of-concept, follows a different merge-logic than `git merge` and probably has more design/implementation flaws yet to be discovered... Jeff King...