add a branch dev
change readme
add
conflict fixed
commit
change
master change
conflict fixed
change
change bbb
merge with no-ff
commit changes
commit
a
a
a
a
a
a
Merge branch 'dev'