How to develop/fix bugs in different branches in phpStorm?

Question

git

Knowledgeable people, tell me.
I develop in phpStorm, all changes immediately go to git in master.
I want to start creating new functionality. How to properly separate the development of individual branches, i.e. so that it would be possible to develop the main functionality separately from fixing bugs?
Start a new project in phpStorm and copy all the code from the git there, but push it to your branch?

Answer 1

Gitflow to help you)

Answer 2

Load master
Create feature1 branch, work in it
If you need to fix a bug, then
-- commit the current state to feature1 branch
-- switch to master
-- create bug1 branch
-- fix bug
-- commit bug1
-- switch to master
-- merge bug1 to master
-- deploy master
Switch to feature1
Rebase master
Continuing work on feature1
Something like this. In general, as already advised above, we study the principles of the git and the recommended git flow