I've got a local db and install of Craft as well as a remote. I'm pushing to bitbucket from my local Mamp environment then pulling from bitbucket to my server via ssh.
I recently updated Craft by clicking the prompt inside the dashboard. When I did this, it editing nearly every file in
/craft/app leaving a ton of modified files registered in git.
I should have had craft/app in my
.gitignore file but I didn't. Now when I try to pull I'm getting this error:
error: Your local changes to 'craft/app/Info.php' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge.
How can I force my remote build to ignore everything in craft/app so I can get back to pushing/pulling.