branch
feature1
master2
conflict fixed
merge normal
merge with no-ff
dev1
merge dev1
merge dev,dev1