Creating a new branch
simple
commit
add merge
merge with no-ff