Fighting Git Workflows

on YouTube ↗21m

" summary

A 16‑year Windows codebase of 3 million lines and a ~20‑developer team migrates from SVN to Git/GitLab and runs two 6 months experiment workflows: A (SVN‑like merge into master, QA on master) and B (feature‑branch QA, frequent rebases). The team adopts auto‑rebase and merge via GitLab bots, Jira sync and CI pipelines; it reduces manual merging but forces frequent rebases, creates long‑lived branch pain, and drives heavy build load requiring beefy servers. The automation works but is not a silver bullet.

AI-written summary · about

" chapters (9)

1. 0:00Start
2. 1:47Some context
3. 4:06OUR TEAM ON SVN
4. 6:54Merging vs. Rebasing
5. 12:08When to integrate changes
6. 17:47GitLab Runner Pipeline
7. 18:06GitLab Pipeline Scheduler
8. 18:51MR behind master
9. 20:07Tools & People

" related talks

• 27mModern Source and Version Control with GitChristian Couder · FOSSASIA Summit 2017
• 30mJourney To The CloudEric Labourdette, Vince Stammegna · GitLab Commit San Francisco 2020
• 21mGit Good – How knowing git can make your life easierFeu Mourek · OSMC 2022
• 27mDevOps Days MTL 2019 - Christian CouderChristian Couder · DevOpsDays Montreal 2019
• 46mComic book continuity and Git rebaseGavin Davies · PHP UK Conference 2016
• 01h 22mGit-ting along with othersPaul Anzel · PyData Los Angeles 2019
• 01h 39mMastering git collaboration -A DevOps necessityRaimund Andree, Gael Colas · PowerShell + DevOps Global Summit 2025
• 01h 08mHow Effective Teams Use GitEnrico Campidoglio · NDC Oslo 2020