3 ms·
You could merge PRs branches (not PRs itself) into a shadow-master branch. Every push to any PR creates a fresh shadow-master with selected (labeled) PRs's bran
by Existenceblinks 4y ago
You could merge PRs branches (not PRs itself) into a shadow-master branch. Every push to any PR creates a fresh shadow-master with selected (labeled) PRs's branches merged. We call this an acceptance branch. Each acceptance branch could have its coresponding staging server.
You could have several acceptance branches with different PRs merged. Each PR can be included/excluded (labeled/unlabeled) back and forth from the acceptance branch (get a fresh one on every label attach/detach)
That's what companies I worked with do. And I even built a SaaS app for that, though they don't want to publicly advertise the app.
- kcb 4y agoSimilarly gitlab supports merge results pipelines. https://docs.gitlab.com/ee/ci/pipelines/merged_results_pipelines.html#enable-merged-results-pipelines https://docs.gitlab.com/ee/ci/pipelines/merged_results_pipel...
- Existenceblinks 4y agoYes, partly! > Merged results pipelines can’t run when the target branch has changes that conflict with the changes in the source branch. Yeah, the app I built even use git's `rr-cache/` (rerere feature) and have gui for resolving conflict and marking it as resolutions. Pretty neat.