Just playing around with git commands.
-- Just playing around with git commands. Trying to do a merge --no-fs --logs now.
merge --no-fs --logs