Enhance classic git workflow to include qa

onaled777
onaled777 used Ask the Experts™
on
Hello, I am in the process of coming up with a git work flow for the company.

I have been looking at the classic example of a successful git strategy:  https://nvie.com/posts/a-successful-git-branching-model/

I have two questions:
1. I first wanted to confirm how everything gets started.  I take it, an empty master repository would first be created and the develop would be branched from that master branch?
2. If the company wants a QA branch in addition to all the other branches recommended in the model, my question is how is that best included so it creates less issues down the line?
 - should the qa branch be cut from the master and then develop branch cut from qa?
- should both the qa branch and the develop branches be cut from the master, with merges taking place from develop to qa as needed?

Please note, the reason they don’t prefer to have a qa branch, is to allow cherry picking of the features included in the branch from the develop branch.

Thanks for any direction you can provide..
Comment
Watch Question

Do more with

Expert Office
EXPERT OFFICE® is a registered trademark of EXPERTS EXCHANGE®
Hi,

-1 you can read this as a guidance this is very well explained
https://guides.github.com/introduction/flow/

-2  QA branch will be merged to the Master when everything is tested.
(Dev, QA and  Master should be 3 different branch to my opinion)

You can create a dummy project and test different methods,  so you will see what fit the best for the needs.

This need to be discussed with the persons who is going to use it as they may have some experiences and suggestions.

Also the use of the tags is very important..

Do more with

Expert Office
Submit tech questions to Ask the Experts™ at any time to receive solutions, advice, and new ideas from leading industry professionals.

Start 7-Day Free Trial