How to add master branch changes to my branch without losing changes in the latest one?

Question

git

Hello everyone and thank you for noticing my question!
I know very little about GIT, so far I only know the basics, so sorry for the noob questions.
They gave me a separate branch on a remote repo, let's call it test.
I downloaded the project for myself, then the test branch.
I made a bunch of edits there, committed them, pushed them to the remote test branch.
I asked the director to merge master and my test, to which they answered: "We are working on a new feature. Tomorrow we will update master with this feature. Merge this feature into your branch, check that there are no conflicts and send it to the remote again test."
The question, in fact, is how to pour this new feature into your branch so as not to lose your edits? From the master to make merge in test?
Thanks for helping git stag!

Answer 1

Optionally do a fetch :
Then merge:
If there are conflicts, resolve in a convenient way and commit:
Then push the changes to your remote branch:
git push