How to sync forked code?

Question

git

Good afternoon.
Some time ago, I cloned one project and made my edits to it, created a pull request.
At this time, the code in master has been significantly rewritten (no PR yet), so it is now necessary to update my code to match the original and make some additions without affecting my previous changes. How can i do this?

Answer 1

git checkout master
git pull upstream master
git checkout feature
git merge master

In general, there are a lot of articles on this topic on your Internet, for example, on your favorite habrik https://habrahabr.ru/post/125999/ :)