add branch dev
new branch feature1
modify master
conflict fixed
fix bug 101
merged bug fix 101
finish dev
finish modify readme.txt dev
master commit
master commit after merge