Can't deal with GIT. Please explain what to do in this case?

Question

git

Recently started learning git. But the study "stood" at such a moment.
There are three branches:
master, test and develop.
Major improvements are being made to the project in the update branches of the develop branch.
But suddenly there was one urgent task, for example - to fix a bug.
I understand correctly that in such a situation, you need to follow these steps:
1. Create a branch, for example, bugfix in the develop branch
2. Fix the bug - commit.
3. Merge from develop, remove the bugfix branch.
4. Merge the develop branch with the test branch.
5. Roll out the test branch to the test server - test that everything works as it should.
6. Merge the test branch from master and roll it out to the production server.
But, what then to do with those edits that were made in the update branch? After all, in this branch there will be no fixed bug.

Answer 1

Upload there (in update) the current version developwith the necessary fixes.
It is possible to rebase developor cherry-pick certain commits with fixes, but this will break the story. And so - it is clearly visible what goes where, after which and with what motivation ...

Answer 2

After the development branch is updated to the latest version, go to your update branch and do git rebase develop. This way you will pull the most recent changes to your update while ensuring that your commits in this branch are front.