[suralind]

Guys, there’s a tool called mergiraf[1] that does wonders. I don’t remember my last rebase

[1]: https://mergiraf.org/

[senfiaj]

Yeah, I also thought that a semantic merge is the best solution. It would be nice if it could be extended with custom formats such as sqlite.