create new branch dev and file dev01
add merge
 merge with no-ff dev
 modify dev01:add dev branch testing
modify dev01: add new file
merge with no-ff dev
fixed bug