How to work with Git in a team?

Question

git

Good afternoon.
I am mastering git, I decided to play around with branches and create my own branches for separate logic in the application. The remote repository is stored on Bitbucket. Actually, the problem is this: from each branch I make a pull request to master, then on any one branch merge and after that conflicts begin on other branches, because the previous version of the repository hangs on them.
It is clear that conflicts can be resolved by hand, but the problem is that the more branches, the more conflicts, which means that each release will take a lot of time just to resolve conflicts.
How are such problems circumvented in team work? Perhaps there are some branch structures?
Thanks for answers.

Answer 1

create your own branches for separate logic in the application

You clearly do not understand the essence of Git and are doing it wrong.
Here's a great tutorial .

Answer 2

After certain logic is implemented, you merge with the master, and the branch can essentially be deleted. I don’t understand what conflicts you have, do you constantly switch between branches or what?

Answer 3

first you need to learn how to work with one branch
add
commit
pull
push
is enough

Answer 4

using gitflow, very satisfied