modified on branch dev, 1
modify on dev, the second time
modified on branch feature1, the first time
on master
conflict fixed
test --no-ff
merge with no-ff
test
bugfix 101
test only
test only
for new feature
Merge branch 'feature-vulcan' into dev
Merge branch 'dev'