I am getting this error when I am trying push my files into heroku rep.
Ive set autocrlf = false already in gitconfig but this problem is still there. i have also tr
It would appear that you are not fully up-to-date. You would need to do a git pull and either "--rebase" or let it merge into your set.
After this, you should then be able to push, since it would be a 'fast-forward' change that wouldn't remove history.
Edit: example command list
git pull git push