file1.php
modified file1 in branch2
mod file1.php again
file3branch
Merge origin/master