I'm a self-taught dev focused on websites and Python development.
My friends call me the "Data Genie".
When I get bored, I find tech to read about, write about and build things with.
Make sure you stash work in progress. The hard flag will restore clean files and the reference to upstream will move your repo to be ahead or behind so it is in sync.
I also use the merge approach you suggested.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
You can also do this to get your fork to match the upstream especially if you accidentally committed and want to get a clean fork
Make sure you stash work in progress. The hard flag will restore clean files and the reference to upstream will move your repo to be ahead or behind so it is in sync.
I also use the merge approach you suggested.