We currently have merge using rebase, with optional "query fixup" to reconcile changes. We are currently experimenting with various automatic fixup strategies f

We currently have merge using rebase, with optional "query fixup" to reconcile changes. We are currently experimenting with various automatic fixup strategies for different use cases. We also intend to have a full git-like merge in the near future. Yes, very practical to ship with local software - it is designed for that and I think it would be possible to run with just web tech.