init
master branch
test branch
hotfix
hotfix
conflict resolved
master merged to the test branch
test branch next modification
modification in master
test