5
votes
Why shouldn't I merge two feature branches in git-flow?
Merging two features
If you merge feature branch B into feature branch A, then A contains both the features of A and B. That's what merging is, after all.
This means that you no longer have two ...
- 59.5k
4
votes
How to improve my current development/release process
By merging your feature/fix branches separately to staging and master, you are very likely releasing on master combinations of features & fixes that were never tested by QA in that combination. ...
4
votes
Is my git branch strategy best practice?
This exact workflow I've successfully implemented for my projects.
There is a minor complication though: we use Maven and it implies that for each patch/bugfix a version defined in pom.xml file is ...
- 4,507
4
votes
Accepted
Is my git branch strategy best practice?
If you make sure that the master branch can be released at any time, so that the following conversation can happen:
CEO: Is New feature X already done?
You: Yes, it has been tested and merged.
CEO: ...
3
votes
Accepted
Working on different release branches at the same time using git flow
You don't need to make things complex. Create a 2.x branch from develop. Periodically merge develop into 2.x. When a bugfix is applied to a 1.x branch, be sure to merge the 1.x branch into develop, ...
- 46.6k
2
votes
Is my git branch strategy best practice?
I actually had same question some time ago here: https://stackoverflow.com/questions/73109008/release-branch-process-how-to-merge-release-branches
The answer I got and accepted seems similar to your ...
- 320
2
votes
Is there justification for testing only master in an integration environment?
There are different solutions to the described problem, but allowing to test other branches in an integration environment is only one approach. Moreover, as noted in a comment, it is only sensible if ...
- 221k
Only top scored, non community-wiki answers of a minimum length are eligible