How to organize work with git for a new project?

Question

git

Hello everyone, I have always worked with git simply as a user, for whom branches are merged, they say from which to inherit a new created one, etc. Never knew which branches to build initially and more. What tutorials do you know how best to organize all this, so far I have created only master, develop, testing, develop and testing are inherited from the master. Thanks in advance

Answer 1

Use the gitflow approach - https://habrahabr.ru/post/106912/

Answer 2

Master - a branch that is ready for release at any time.
Dev - the branch in which development is carried out.
If you find some error or add a feature, you should split the branch from dev, name it accordingly (login, for example), add all changed or new files for commit, and then push. After all the changes are uploaded to the repository, it is worth updating your branch from dev (go to it and make a pull). This is done to avoid merge conflicts. Then merge all the changes that took place in the dev branch into your own. Now there will be no conflicts and a branch with resolved conflicts in the repository. Next, use pull-request to merge the new branch with dev