pull readme.txt ro dev branch
commit in feature1 branch
commit on master
conflict fixed
commit on feature2 branch
merge with no-ff
add HelloWorld.java on dev branch
fix bug issue-100 on branch issue-100
add Helloworld.java on feature branch
Merge branch 'feature'