one
Master1
Bar1
Bar2 (resolve)
Master2
Merge branch 'master' into bar
Bar4
Clean up big file
Resolve merge
Merge branch 'master' into bar