Deletes the last 3 commits

git reset --hard HEAD~3

Deletes all commits after the specified commit and moves HEAD to that commit (this will get rid of changes so we should be careful)

git reset --hard 004caa3

When trying to pull the latest commits, the error was

error: The following untracked working tree files would be overwritten by merge:
        app/Log.php

The solution that fixed the problem:

git add * 
git stash
git pull