git: how to re-syc a fork?

Question

the workflow we are required to follow is this:

1. fork a project on github into your own private githib account.
2. clone forked project to local machine.

Answer 1

As the other answer describes, there is nothing wrong in having 2 remotes. Actually, to submit feature branches, you do not have to perform any re-syncing or your fork. You need to follow so-called triangular workflow (search there for "Improved support for triangular workflows").

tl:dr:

git clone 
cd clone
git add upstream 

git fetch upstream
git checkout -b  upstream/master

git push origin 

As you can see, you only update here the branch of your fork, which is up-to-date with upstream - just the one you need to submit a PR. Basically, the whole purpose for the fork to exist is to have that one branch, then there is no reason to maintain other branches in the fork.

The question Best practice for tracking upstream in fork on github goes beyond that, it needs to "tracking of changes unique to the fork". When such goal arises then there is a task of maintaining those changes up-to-date, but not before.