How do you work with GIT branches in PhpStorm?

Question

git

Hello.
I want to ask how to work with branches correctly.
I have a project located on the mydomain[dot]com domain, where a pull is configured from the master branch.
When I start developing a new feature, I checkout as new branch, create a new branch from the master branch, and work on it.
Since the development of a new feature can be lengthy, and in the main project, for example, an urgent bug may surface, I switch to the master branch, make a fix, then switch back to the feature branch and merge from the master so that the bug is fixed in this branch as well.
Along the way, I push the changes from these branches to the server and push the changes to dev .mydomain[dot]com.
Everything would be fine, but in the latest version of PhpStorm, the git branch is always master when pushing, and before it was remembered.
And now I've been working on a new feature for several days, and by accident, while uploading changes to the test server, I pushed everything into the master branch. Very uncomfortable. In a letter to jetbrains, they answered me that "VCS engineers know better" what is more convenient.
How do you work?

Answer 1

I have develop and master branches only through merge request.
All fixes are pushed into temporary branches, which are then merged after the review.
All work with git on a computer from the console, it is clearer and more predictable.