Help with github

Question

Hi guys,

I have created a fork from a github repository and made some bug fixes. The fixes I've created were pushed and merged with the original repository. After some while the original repository had some other bugs fixes that were merged by other people. How can I synchronize my fork again with the original repository?

Answer 1

Usually once a merge occurs you cease work on the fork/branch. Then you re-pull from master and if you need to make more fixes you make a new fork for those specific changes. Otherwise the main git engine can develop some issues merging multiple, long term, many fix, forks.