changes by my_branch
changes by master
2. in my_branch
merge two fields
new field in my_branch2
hotfix
master commit
hotfix 2nd commit
hotfix 3rd commit
master 2nd commit
merge hotfix to master
new text file
merge with master branch