SHELL

error: The following untracked working tree files would be overwritten by merge: static/platform_images/landing_page_img.png Please move or remove them before you merge. Aborting

git add * 
git stash
git pull

error: The following untracked working tree files would be overwritten by merge: config/scheduling.php Please move or remove them before you merge.

$ git add *
$ git stash
$ git pull origin master/{branch_name}