dev branch first
and simple
annd simpple
conflict fixed
dev commit ...
merge with out fast forwar
issue-101 fixed
merge issue-101
commit it
issue-102 commit...
merge issue-102
master commit... issue-102
dev ok
merge dev ok