make changes to dev_1.0
change but not pushed to origin
change and pushed to origin
new branch
new branch, dont push origin
issue3
change and pull
merge fix conflict
merge issue#2 to master