Edit Question - KnowledgeHub

Title Body

I am getting this error when I am trying to push to the Heroku repository. I've already set autocrlf = false in gitconfig but this problem is still there. I have also tried this solution here but it does not work. Is it possible that git is still using an old config setting? If yes, then how can I refresh it? C:\myapp>git push heroku To git@heroku.com:myapp.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'git@heroku.com:myapp.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. While trying git pull heroku master : warning: no common commits remote: Counting objects: 215, done. remote: Compressing objects: 100% (147/147), done. remote: Total 215 (delta 82), reused 132 (delta 62)Receiving objects: 79% (170/ Receiving objects: 100% (215/215), 1.49 MiB | 107 KiB/s, done. Resolving deltas: 100% (82/82), done. From heroku.com:myapp * branch master -> FETCH_HEAD Auto-merging start.php CONFLICT (add/add): Merge conflict in start.php Auto-merging src/appinfo.txt CONFLICT (add/add): Merge conflict in src/appinfo.txt Auto-merging result.php CONFLICT (add/add): Merge conflict in result.php Auto-merging landhere.php CONFLICT (add/add): Merge conflict in landhere.php Automatic merge failed; fix conflicts and then commit the result. While trying git push heroku -f : F:\myapp>git remote add heroku git@heroku.com:myapp.git F:\myapp>git push heroku Counting objects: 41, done. Delta compression using up to 4 threads. Compressing objects: 100% (40/40), done. Writing objects: 100% (41/41)

Tags (comma-separated) Cancel