We would need some rules for how to resolve collisions. If I change a record in two different ways, which one wins?
In my implementation, the default is to take the records from the "other" branch because you want 'devel' in 'master' not the other way around. Not sure I am clear. LMK.