Hi Eirik,
That's my favourite way to do it, too!
The Python SDK is autogenerated from the Swagger API. So it supports everything in that API. Docs are also auto-generated, so they do
cover merge strategy in the example. Basically just add your desired merge strategy.
BUT while this may resolve "conflicts", it will
not resolve "dirty branch". If you have those, you probably have uncommitted changes on a branch somewhere. Merge can only work with committed data.