'Gated check-in in release candidate development
I have two active branches in development: release, and master. In my development process, all the changes that are pushed into release branch are required to merge into master as well.
Developer A:
feature_1 -> release -> master
Let say Developer A have merged the changes from feature_1 branch into release successfully. When Developer A is merging release into master, Developer A found that conflict is occurred because of the changes that were pushed into release branch just now. Developer A resolved the conflict and created pull request and waiting CI to complete the validation before the pull request can be merged.
Developer B:
feature_2 -> release -> master
While Developer A is waiting validation to be completed, Developer B merged feature_2 branch into release successfully and going to merge release to master too. However, Developer B is getting blocked because the conflict is not completely resolved by Developer A yet. In the scenario, is there any way for Developer B to merge his changes from release to master without getting blocked by Developer A?
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|