I am having some troubles finding a better model for my CI/CD cycle.
This is mainly gitflow issue.
My current model : We have 2 bitbucket branches : master and develop.
Both are linked via webhooks to jenkins to be deployed to prod. and dev. servers.
QA team for testing features and releases on dev. server.
Team of developers for both frontend and for backend. With lots of troubles.
The problem : Team manager wants to be able to have better control over accepted/rejected features. Say : developer1 committed a feature to develop branch, developer2 added a hotfix to develop, we want QA team to easily test them both separately, and then testing both together with the least hassle possible. And afterwards easily select what commit stays and moved to master branch.
As I said, this is mainly gitflow issue.