title: Merging already pushed commits
body: <p>O hai everybody,</p>
  
  <p>I'm a git novice and I messed up. I think I need to use rebase, which makes me fall into panic mode. Please help me :-D</p>
  
  <p>So, I cloned a repo on a machine called alice. I did some 20 commits and then tried and failed to push since alice lost Internet connection. So I used an USB stick to move my edited repo to machine called bob, and there I did the pushing and everything went better than expected. <em>Update: at this point I copied my origin to a separate remote (I moved my project from github to a private repo on my own server). I added this new remote to my repo on alice, but I didn't pull from it or anything, since alice has no Internet connectivity.</em></p>
  
  <p>Then I returned back to alice, forgot that I already did the push, did 20 more commits. Now I have repo on alice with 40 commits since last push to old origin, remote origin with 20 of those 40 commits already pushed <em>update: and remote dijxtra also with 20 of those 40 commits already pushed. I tried pushing to dijxtra, but it failed (see bottom).</em></p>
  
  <p>What do I do? I figure this is a quite simple problem with a quite simple solution, but I just can't wrap my head around it... Update: I do not wish to push to origin (which would probably be easy) since it is a public repo and I have added some confidential data which must not be published.</p>
  
  <p>edit:
  Here is what I get when I try to push the newest version (40 commits). This is me on bob trying to push repo coiped from alice:</p>
  
  <pre><code>nick@rilmir:~/tmp/simulator$ git push dijxtra master
  dijxtra@dijxtra.net's password:
  To dijxtra@dijxtra.net:git/simulator.git
   ! [rejected]        master -&gt; master (non-fast forward)
  error: failed to push some refs to 'dijxtra@dijxtra.net:git/simulator.git'
  nick@rilmir:~/tmp/simulator$
  </code></pre>
  
  <p>edit2:
  Now I remembered: I'm not pushing to origin. That's right, this might be the problem. Let me update the post. Updates are in italic.</p>