That is up to the upper layers to decide which record wins. In my implementation, the default is to take the records from the "other" branch because you want '

That is up to the upper layers to decide which record 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.