branch dev first
branch f1 commit
& simple
merge brach
add merge
merge with no-ff