Company
Date Published
Author
David Gomes
Word count
1446
Language
English
Hacker News points
1

Summary

We've been using the Git Rebase workflow with GitLab Code Review and CI for over a year now, managing a large repository with 10-40 commits per day across multiple time zones. We use the "Fast-forward" merge method in our Merge Requests configuration to force rebasing of side branches against the main branch before merging. However, this requires us to manually trust that pipelines have succeeded and been recently updated, rather than having a one-click rebase operation. To address this, we're exploring features like Merge Trains, which could allow us to push all code changes into a train instead of the main branch, eliminating pipeline time waste. We've also set up custom roles for our CI pipelines to enable manual deployment and deployment notifications via a Slack bot, making it easier to manage our deployments and track changes.