title: git push rejected
body: <p>I give up!
  Whenever I try to push I get a stupid: </p>
  
  <pre><code>! [rejected]        master -&gt; master (non-fast forward)
  error: failed to push some refs to 'git@github.com:companyX/projectX.git'
  </code></pre>
  
  <p>Our team has a new git setup. Instead of making private branches I now Forked our main repository (on github) to create my own copy.</p>
  
  <p>At some point what I did was:</p>
  
  <pre><code>$ git fetch upstream master:upstreammaster
  </code></pre>
  
  <p>So here is my current setup::</p>
  
  <pre><code>$ git branch
  master
  * upstreammaster
  
  $ git remote -v
  origin  git@github.com:userX/projectX.git
  upstream    git@github.com:companyX/projectX.git
  </code></pre>
  
  <p>where userX is my private repository.</p>
  
  <p>So I go and make some changes to my upstreammaster branch, and the PULL from "upstream master".
  Everything merges and stuff:</p>
  
  <pre><code>$ git pull upstream master
  remote: Counting objects: 95, done.
  remote: Compressing objects: 100% (60/60), done.
  remote: Total 60 (delta 54), reused 0 (delta 0)
  Unpacking objects: 100% (60/60), done.
  From git@github.com:companyX/projectX
   * branch            master     -&gt; FETCH_HEAD
  Merge made by recursive.
  stuff                      |  165 ++++++++++++--------
  stuff                      |   35 ++--
  stuff                       |  107 ++++++++++---
  stuff                       |  105 ++++++++++---
  stuff             |   24 ++--
  stuff               |    9 +-
  stuff                   |   53 +++----
  stuff            |   44 +++---
  stuff              |   52 +++----
  stuff |   32 +----
  stuff          |    4 +-
   stuff             |  138 ++++++++---------
  stuff     |   58 ++++----
  stuff    |  115 ++++++++------
  stuff          |    5 +-
  stuff                       |   39 ++---
  stuff                        |   28 ++--
   17 files changed, 560 insertions(+), 453 deletions(-)
  </code></pre>
  
  <p>but then when I try to do:</p>
  
  <pre><code>$ git push upstream master
  To git@github.com:companyX/projectX.git
   ! [rejected]        master -&gt; master (non-fast forward)
  error: failed to push some refs to 'git@github.com:companyX/projectX.git'
  </code></pre>
  
  <p>Any help would be greately appreciated! If you need clarification please ask, I will reply!</p>