WIP: operations: add merge2.go using merge-ort

This is to check if we could use the new "ort" merge strategy for our merges, instead of libgit2, and to find issues preventing us from doing that.