Reputation: 1
Currently the process is this.
However, if two devs are working on something at once:
However in the second case, Dev 1s broken changes are being merged into develop as they have to update their branch as they're behind when they merge into testing.
Is there a way you can merge changes without the changes in the target branch being merged back into your feature branch? And this must be done via a pull request as we have code scans that run at each stage that must complete before the merge can happen.
We have no choice but to update the branch when raising the pull request as we're behind in commits, so do we have to accept we can't run code scans between feature and testing and have to do the merge via CLI?
Upvotes: 0
Views: 38