title: Whats the best way to work with Github and multiple computers?
body: <p>I am developing some school grading software and decided to use Github to host the project.  After building some code on my Ubuntu box I pushed it to Github and then cloned it down to my MacBook Pro. After editing the code on the MBP I pushed it back to Github. The next morning I tried to update my repo on the Ubuntu box with a <code>git pull</code> and it gave me all kinds of trouble.</p>
  
  <p>Whats the best way to work in this situation? I don't want to fork my own repo and I don't really want to send myself emails or pull requests. Why can't I just treat Github like a master and push/pull from it onto all of my personal repos on different computers?</p>