commit of changed files (only temporary)
commit of some changes at master
Merge branch 'some-new-files' into some-changes-at-master
commit with file002 and file004 deleted
commit
file006 removed again (but file005 is still in)