title: Using GitHub and Eclipse to pull code
body: <p>I have a repo <a href="https://github.com/the1mills/db4oProject" rel="nofollow noreferrer">on GitHub here</a>.</p>
  
  <p>I have pushed to this repo from two different machines, so now one machine is current and another has outdated code. Right now, I am on the machine with outdated code, and I want to pull in the master/HEAD/whatever from GitHub.</p>
  
  <p>And then I get to stare at this:</p>
  
  <p><img src="https://i.stack.imgur.com/Sfebd.png" alt="enter image description here"></p>
  
  <p>I do not want to do something stupid like delete the project from Eclipse and then pull in all the code from GitHub.</p>
  
  <p>Can someone please help me merge/synchronize the projects? This is as simple as it sounds.</p>
  
  <p>Unfortunately, this is what happens when I click "Pull" on the above menu:</p>
  
  <p><img src="https://i.stack.imgur.com/B1i67.png" alt="enter image description here"></p>
  
  <p>Would someone also explain what the difference is between Pull, Merge, Fetch and Synchronize?</p>