title: failed to push some refs to git@heroku.com:myapp.git
body: <p>I am getting this error when I am trying push my files into heroku rep.
  Ive tried following solutions but none helped:</p>
  
  <ol>
  <li><a href="https://stackoverflow.com/questions/5669209/why-do-i-get-error-failed-to-push-some-refs">this</a></li>
  <li>Tried <code>git pull heroku master</code> (results below)</li>
  <li>Tried trying <code>git push heroku -f</code> (results below)</li>
  <li>set autocrlf = false</li>
  </ol>
  
  <p>Kindly guide me through this.</p>
  
  <p>Thank you</p>
  
  <pre><code>C:\myapp&gt;git init
  Reinitialized existing Git repository in C:/myapp/.git/
  C:\myapp&gt;git add .
  C:\myapp&gt;git add -u
  
  C:\myapp&gt;git commit -m "ic"
  # On branch master
  nothing to commit (working directory clean)
  
  C:\ myapp&gt;git push heroku
  To git@heroku.com:myapp.git
   ! [rejected]        master -&gt; 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.
  </code></pre>
  
  <hr>
  
  <p>while trying <code>git pull heroku master</code></p>
  
  <pre><code>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     -&gt; 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.
  </code></pre>
  
  <hr>
  
  <p>while trying <code>git push heroku -f</code></p>
  
  <pre><code>F:\myapp&gt;git remote add heroku git@heroku.com:myapp.git
  F:\myapp&gt;git push heroku -f
  
  Counting objects: 41, done.
  Delta compression using up to 4 threads.
  Compressing objects: 100% (40/40), done.
  Writing objects: 100% (41/41), 1.36 MiB | 12 KiB/s, done.
  Total 41 (delta 0), reused 0 (delta 0)
  
  -----&gt; Heroku receiving push
   !     Heroku push rejected, no Cedar-supported app detected
  
  To git@heroku.com:myapp.git
   ! [remote rejected] master -&gt; master (pre-receive hook declined)
  error: failed to push some refs to 'git@heroku.com:myapp.git'
  </code></pre>