You forked a repository on Github. Now, the original has some updates. How do you pull the changes from the original (upstream) repository into yours?

And if your source is in conflict with the original source, do you have a chance to edit it manually?

If you’re asking these questions … then this is for you.

  1. GitHub / Collaborating / Syncing a fork
  2. Stack Overflow: Keep sync with another git repository?