new branch dev test
Merge branch 'dev'
 AND simple on branche feature1
& simple on branch master
confict fixed on branch master
learn how to use no-ff merge
merge with no-ff
feature2:add compare no-ff merge
feature2:add compare no-ff merge on master
conflict fixed on master from feature2 branch
commit add file4 and edit readme.txt
commit readme.txt on dev second
i commit dev
merge with dev