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
by Valeri Tandilashvili
4 years ago
Git
errors
2
Pro tip: use ```triple backticks around text``` to write in code fences