title: Keep sync with another git repository?
body: <p>I forked a repository on Github. Now, the original had some update. How can I pull the changes from the original repository and keep sync with them?</p>
  
  <p>And if my source is conflict with the original source, do I have a chance to edit it manually?</p>
  
  <p>EDIT1: Thanks everyone's help. I think I need to RTFM :)</p>