commit at branch dev
add in branch dev
commit by master
merge branch dev & master
add line
add another line.
merge with no-ff