How can Gogs track changes to the original repository in a fork?

Question

git

Actually a subject...
There is a turnip on Gogs. It has a main project, which is led by the head of the development department.
There is me and a few other proggers. Now everyone writes to the main turnip in master and IMHO this is not Feng Shui.
The idea is that everyone forks the main turnip and works in it, creating pull requests upon completion of the work. I can’t understand one thing, let’s say I forked the repository, I’m working with it. At some point, I finished and created a pull request, it was approved, etc. But that's bad luck, while I was working in the main repository, I was writing more people and my turnip and the main one are different. Now I do not understand how to do it right? Should I make a new fork every time? Or I stupidly did not find where to synchronize turnips?
In general, how feng shui is this approach? In general, the idea is that in the future, their repositories will be tied to separate dev servers with auto-deploy.

Answer 1

You don't need to make a new fork every time, you just need to add the main turnip as upstream and pull the changes from there. In the fork do:
For pulling changes from the main turnip
git pull upstream