A new version, a new YouTube video: https://youtu.be/6jry6NKxGJA.
This one shows a rather difficult merge causing Git a headache, then being handled with aplomb by Kinetic Merge.
Strictly speaking this isn’t a Scala question, but as it’s written in Scala, I feel it’s nice to talk about deliverables instead of snippets of code every now and then.
Anyway, even if it’s not for you, let your chums working in Java, Python and Algol 68 know.
I’m off to go learn some new stuff away from the software engineering field, but will still look at bug reports, so file away if you encounter problems. I daresay that I’ll still pop up here every now and then from force of habit too. 
EDIT: The repository shown in the demonstration is here: https://github.com/sageserpent-open/mergingSandbox if you want to try for yourself.
Good merging!