R
R
Rinat Sibgatullin2018-03-16 10:48:18
git
Rinat Sibgatullin, 2018-03-16 10:48:18

What is the best way to organize work with git for 3 employees?

Hello!
It is necessary to organize collaboration with git (bitbucket) for 3 employees.
We want to develop a site on the dev.site.ru subdomain and upload the final version to site.ru, how best to organize it. Just how is it better to create branches in git, assign each branch to an employee, or is it better to make branches in the form of versions?

Answer the question

In order to leave comments, you need to log in

3 answer(s)
D
Dmitry Eremin, 2018-03-16
@bulgar989

We have a team of 3 people.
There is a release branch - a branch in which the actual code of the sale is stored (you can also master, it just happened historically for us)
There is a release-x.xx branch (like release-1.12, release-1.13, etc.). This is a release candidate branch - we merge into it everything that we want to post at the end of the current sprint. This thread is being tested.
How it works:
Release-x.xx is created from the release branch.
Next, the developer makes a branch for himself in which he will make a feature. Done - fills in release-х.хх
So, by the end of the sprint, the release-х.хх branch is filled with features Tested Release If everything is ok on the market and works without
akhtungs for 1-2 days - fill in release-х.хх in release. And a new circle

I
iMaximus, 2018-03-16
@iMaximus

Team of 20 people. There is a master branch. If you need to make a feature or fix a complex bug, the developer sprouts from it and does what he wants on his branch. Through a pull request after code review, it merges changes into master. The new release is simply cut off from the master when the time comes. Further in the release branch, only a bug fix and the master goes further forward.

S
Saboteur, 2018-03-16
@saboteur_kiev

How is your team of three different from any other team that a standard, documented workflow doesn't work for you?
https://git-scm.com/book/en/v2/Git-Branching-Branc...

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question