Best (in your opinion) GIT workflow for case when releases are done on demand (in most cases 1-2 tickets at once)
- by Robert
I'm rather a Git newbie and I'm looking for your advice.
In the company I work for we have a "workflow" where we have a single Git repo for our project with 2 branches: master and prod. All devs work on the master branch. If a ticket is done (from the dev perspective), we push to the repo. If all tests are passed, we make a release.
The issue is that in most cases, the request from business guys sounds like: "please release ticket A or A && B".
In most cases, I end up doing something like
git checkout prod
git cherry-pick --no-commit commit_hash
git commit -m "blah blah to prod" -a
As you can see this is not a perfect solution, and I'm under a huge impression this is a perfect way to nowhere especially when change A depends on changes B and C.
Do you have any suggestions how to handle releases on demand if more devs works on the same branch and the flow looks like I described above? All suggestions are welcome.
I cannot change business processes and it will have to stay as it is - unfortunately.