I have the following scenario: 3 programmers (P1, P2, P3) with their local production environments, a QA test server and a production server. According to the business rules of the company there are modifications to the system that should go to production, even before being tested and as habitude, there are changes that must spend time in QA before being sent to production.
The production environment only does PULL of the QA server, just as programmers only pull and push to QA.
My question is when the 3 programmers P1, P2 and P3 do their pushing for QA, but when I do the QA pull for production I just want the changes made by P1 and P3. The change in P2 will need to stay longer being tested.
I do not know how to do this separation of these branches at the time of the pull - nor do I know if it is possible.
myapp-P1 ---
\
myapp-P2 --- ---> myapp-staging (QA) ---> myapp (Prod)
/
myapp-P3 ---
Could anyone give you an idea?