Any workarounds for merging?

[sheluchin]

Is there any temporary workaround we can use to achieve merging while official support for merging is being worked out?

Related to #452

[jelmer]

Stash has a git-merge implementation that's based on Dulwich, but I have never used it. See https://github.com/ywangd/stash/blob/master/lib/git/git-merge.py

The other alternative is to invoke C Git using subprocess.