only source 6 in this commit?
neither -i or -o
deletion in master, should add back from branch
Merge branch 'otherbranch'
oops, try to edit source4 then merge to master where it's deleted.
Merge branch 'otherbranch'

re-created source4

Conflicts:
	src/source4
mv
Added new graphic as demo

Demonstrating add new file.