master branch create a file
feature1 branch create a line
master branch a new line
master branch a new line again
dev branch create a line
merge with no-ff