How to work with develop and master?

Question

git

As I do now , I
initialize git init,
then I make commits (not the essence of what)
then I create a develop branch,
I start committing to develop (more branches appear that merge with develop)
in parallel, I make hotfixes in master
, when the time comes, develop is merged into the master branch
, but develop will disappear .. and it turns out from the merge point you need to create a new develop branch
, and on all screens, develop always remains
here, for example,

how to do it so that it is like on the screen?

Answer 1

git flow

Answer 2

To make it look like in the picture, you need to use the --no-ff flag when merge, then 2 branches will go in parallel, and will not merge into one.
There will be no fast forward, this is such a reverse rebase, if you can call it that.

Branches:
*master
dev
> git merge --no-ff dev