git branch test
add feature1 simple
& simple
conflict fixed
dev branch
merge with no-ff
fixed bug 001
merge issue-001 to master
finished dev
finished merge