error: The following untracked working tree files would be overwritten by merge: app/Log.php
git add * git stash git pull
Pro tip: use ```triple backticks around text``` to write in code fences