3 ms·
What you describe for testing and merging is a needlessly manual process. Using e.g. Phabricator, I can make a local feature branch and when I think it's ready
by sciurus 11y ago
What you describe for testing and merging is a needlessly manual process. Using e.g. Phabricator, I can make a local feature branch and when I think it's ready open a request for code review. My CI system can run tests. I can update my request in response to test failures or reviewers comments. When my code is ready, Phabricator can squash all my commits into one and rebase that onto master.
If for whatever reason I did want to back out this code, there's a single commit to revert. This is unlikely though, since until a feature has proven itself in production it will be behind a feature flag.
https://secure.phabricator.com/book/phabflavor/article/recommendations_on_branching/ https://secure.phabricator.com/book/phabflavor/article/recom...
- Osiris 11y agoThat's a nice process. Currently, GitLab doesn't support running tests on a merge request in that sense, making a temporary merge of master and the branch and running the tests to confirm the merge will work. When/If GitLab + GitLab CI adds that ability, then yes, it would make that process a lot easier.
- sytse 11y agoWe're discussing adding a 'test the merge' ability in 8.7 in https://gitlab.com/gitlab-org/gitlab-ce/issues/4176 https://gitlab.com/gitlab-org/gitlab-ce/issues/4176 This will test the 'current merge' as soon as a commit is pushed, not the merge result when it happens.