title: GitHub to Heroku Commit Error
body: <p>Am using Aptana Studio 3 and Heroku for a RoR website project. When I push my site to Heroku after a 'commit' via GitHub I keep getting this error. Have searched everywhere but can't find a simple solution that I can follow. Any advice what has happened and how to reslove? Thx.</p>
  
  <pre><code>User$ git push heroku master
  To git@heroku.com:xxxxxx.git
  ! [rejected]        master -&gt; master (non-fast forward)
  error: failed to push some refs to 'git@heroku.com:xxxxxx.git'
  To prevent you from losing history, non-fast-forward updates were rejected.
  Merge the remote changes before pushing again.
  See 'non-fast forward' section of 'git push --help' for details.
  User$ 
  </code></pre>
  
  <p>I tried this suggestion as per below from @SkillDrick and got this plus the error at the end:</p>
  
  <pre><code>User$ git merge heroku/master master
  usage: git merge [options] &lt;remote&gt;...
  or: git merge [options] &lt;msg&gt; HEAD &lt;remote&gt;
  
  -n                    do not show a diffstat at the end of the merge
  --stat                show a diffstat at the end of the merge
  --summary             (synonym to --stat)
  --log                 add list of one-line log to merge commit message
  --squash              create a single commit instead of doing a merge
  --commit              perform a commit if the merge succeeds (default)
  --ff                  allow fast forward (default)
  -s, --strategy &lt;strategy&gt;
                        merge strategy to use
  -m, --message &lt;message&gt;
                        message to be used for the merge commit (if any)
  -v, --verbose         be more verbose
  -q, --quiet           be more quiet
  
  
  
  user$ git push heroku master
  To git@heroku.com:worrybin.git
  ! [rejected]        master -&gt; master (non-fast forward)
  error: failed to push some refs to 'git@heroku.com:worrybin.git'
  To prevent you from losing history, non-fast-forward updates were rejected.
  Merge the remote changes before pushing again.
  See 'non-fast forward' section of 'git push --help' for details.
  </code></pre>