Hello all!! 

I'd like to ask a review not to a source code, but for our git flow.

Here in my team, we use git for some time and as the team started to grow 
up, and our product started to get deployed in new customer's enviromonts, 
our simple flow started to collpase. Too many problems appeared, we ended 
up with a more complex flow, that I want to share with you for opinions. 
Note that we reached this method without knowing if it is an existent 
pattern or not. There it goes:

<https://lh3.googleusercontent.com/-yEz_9CgDK34/WpRqyiS2jJI/AAAAAAAACYQ/mB2HgSTzrYoK7AMorsuQsHVraXfLC8MQQCLcBGAs/s1600/download.png>


Note: I'm sorry, I didn't added arrows to the graph, but the sequence is: 
Start from QA to Feature(1), Feature to Dev(2), Feature to QA(3) and QA to 
Master(4).

Basicly, we have 4 paralel branches: master, QA(Quality Assurance), 
feature, dev. Feature is not a branch itself, these are our feature 
branches, so it changes the name to "task-xxxxx", where xxxxx is the task 
id in our board.

The work starts when a task is created in our board and a branch is checked 
out from QA branch(step 1);
It goes on until it needs a revision from our test team, so it have to go 
to dev branch(step 2). The work can be merged into dev finished or not, so 
everybody sends their work there, it is common to have broken stuff. Also, 
a feature branch can be sent many times to dev branch. It is never merged 
back to the task, to keep all other unfinished work in dev.
After a preliminary approval of the finished task from the test team in dev 
env, the feature branch goes back to QA(step 3). There should have only 
finished work for real testing as it is a much more stable environment;
Only after passing all tests, then it goes to master(step 4), which is our 
stable version, the version that goes to the customers private environment 
or cloud.
My question is about the consistency of this kind of flow. It is still 
fresh for us, so we are testing it, we do not have stepped in any proccess 
flaw or issue with it. It requires a lot of concern by the devs to not mess 
it up, but we plan to add custom policies to make it safer.

Thanks in advance!

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to