Git multi repos
•Download as PPTX, PDF•
1 like•366 views
The document describes a Git multi-repository workflow that allows each team to work independently in their own Git repository while also sharing a central "root" repository. Key aspects include each team having their own repository, a master root repository, and continuous integration (CI) being used to merge changes between repositories and ensure stability on chosen branches.
Recommended
Recommended
More Related Content
What's hot
What's hot (20)
Viewers also liked
Viewers also liked (20)
Similar to Git multi repos
Similar to Git multi repos (20)
Recently uploaded
Recently uploaded (20)
Git multi repos
- 1. Version Control System Git Multi Repos JULIEN PLÉE – DEPUTY CTO AURÉLIE VALÉRY – R&D MANAGER RACHID AGOUDAR – CHIEF SOFTWARE ARCHITECT EMMANUEL GUÉRIN – SOFTWARE ARCHITECT
- 2. Git Multi-repository Goals : ◦ allow each team to work in its own Git environment ◦ Guarantee stability of some chosen branches using CI to realize the merge operations How : ◦ by using the Multi-repository pattern, giving each team its own repository and all teams sharing a master repository
- 3. Git Multi Repos FEATURE DEVELOPMENT
- 4. Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 0 – Initial status Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository arc_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Repositories
- 5. Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository arc_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 1 – Teammate checkouts a new branch “123” from “arc/arc_Sprint-stable” or “arc/arc_Sprint” and develops a task Repositories 123
- 6. Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 0 – The Teammate commits, and pushes branch “123” to “arc/123”. All team “arc” can now work on it Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository arc_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Repositories 123 123
- 7. Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 0 – In the same time, “Root/Sprint” received some new commit from “career-fun” repository Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository arc_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Repositories 123 123
- 8. Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 0 – Jenkins validates the commit and merges it in the branch “Root/Sprint-stable”. Team “fun” fixes potential errors Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository TA_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Repositories 123 123
- 9. Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 0 – Teammate pulls “Root/Sprint-stable” into their team branch “arc_Sprint” Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository arc_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Repositories 123 123
- 10. Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 0 – Teammate pushes “arc_Sprint” into “arc/arc_Sprint” Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository arc_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Repositories 123 123
- 11. Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 0 – Jenkins validates and merges “arc/arc_Sprint” in “arc/arc_Sprint-stable”. Team “arc” fixes potential errors Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository arc_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Repositories 123 123 A Teammate could always use “arc/arc_Sprint-stable” if he wants to be sure to start from a stable commit
- 12. Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 0 – Teammate merges “arc/123” into “arc_Sprint” Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository arc_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Repositories 123 123
- 13. Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 0 – Teammate pushes “arc_Sprint” into “arc/arc_Sprint” and Jenkins validates it. Team “arc” fixes potential errors Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository arc_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Repositories 123 123
- 14. Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 0 – Teammate pulls “arc/arc_Sprint-stable” into “arc_Sprint” and pushes it on “Root/Sprint” Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository arc_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Repositories Note : It will sometimes be needed to Merge “Root/Sprint” into “arc_Sprint” as other teams could have already push something in it So there is no warranty that “arc_Sprint” is stable and the team could be fixing it after
- 15. Git Multi Repos HOTFIX DEVELOPMENT
- 16. Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 0 – Initial status Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository arc_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Repositories
- 17. Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository arc_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Teammate Repository arc_Sprint Environment Bitbucket Servers Workstation 1 – Teammate checkouts a new branch “123” from “root/qualif-stable” and fixes the bug Repositories Bug-fix Bitbucket Servers
- 18. Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 0 – Teammate merges branch “bug-fix” into “Root/Qualif” Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository arc_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Repositories Bug-fix
- 19. Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 0 – Jenkins validates the commit and merges it in the branch “Root/Sprint-stable”. Team “fun” fixes potential errors Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository TA_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Repositories Bug-fix 123
- 20. Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 0 – Teammate can now realize a new release with the up-to-date “Root/Qualif-stable” branch Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository TA_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Repositories Bug-fix 123
- 21. Teammate Repository arc_Sprint Environment Bitbucket Servers Bitbucket Servers Workstation 0 – Teammate merges “Root/Qualif-stable” into “Root/Dev” and “Root/Sprint” (not displayed) and Jenkins validates dev Root Repository Sprint-stable Dev-stable Qualif-stable Sprint Dev Qualif career-arc Repository career-fun Repository TA_Sprint-stable fun_Sprint-stablearc_Sprint fun_Sprint Repositories Bug-fix 123