the last line of dev
the first line of master
del the last line
keep first line  of master
new file 1
new file 2
Merge branch 'dev'
mastet-bug free
new file3 from desktop
merge