one
Master1
Bar2 (resolve)
Master2
Merge branch 'master' into bar
Merge branch 'master' into bar
Bar12