如果更改被隔离到自己的分支中，则只需从上游存储库中提取更改即可.

If the changes are isolated onto their own branch, then you can simply pull the changes in from the upstream repository.

git pull

请记住，这等效于git fetch && git merge操作.

Mind you, this is equivalent to a git fetch && git merge operation.

如果要将这些新更改包括到您的特定分支中，则必须通过git merge将它们合并.请记住，由于对代码库的修改已超过两年，因此您很可能会遇到合并冲突.到那时，您将要弄清楚从旧版API到新版API的变化，并确定前进的***方法.

If you want to include these new changes into your specific branch, you'll have to merge them in via git merge. Bear in mind, with changes to a code base from over two years old, you'll likely run into merge conflicts. At that point, you'll want to figure out what's changed from the old API to the new API and determine the best way to move forward.