Continuous merge with git octopus
Resources
Conferences
- 2017/06/14 - Open R&Day @ Paris, France - Video
- 2016/11/07 - BBL WorkIT @ Paris, France -
- 2016/11/13 - JUG @ Marseille, France -
- 2016/06/29 - BBL Societe Generale @ Paris, France -
- 2016/01/31 - JUG @ Tours, France -
- 2015/12/10 - BBL Octo @ Paris, France -
- 2014/11/01 - AgileTour @ Rennes, France -
Continuous merge: Reconciling feature branching and continuous delivery
This presentation tackles the subject of continuous delivery with tangible solutions, that covers code versioning, handling of multiple parallel developments and deployment of artifacts. The concept of “continuous merge”, made possible by the open-source tool git-octopus developed at LesFurets.com, is the most important part of our continuous delivery process. Continuous merge is a process that emerged from 2 years of daily delivery and enables the early detection of merge problems between branches. It is therefore possible to push to production everyday without sacrificing quality and without adding a burden on our development process.
(french) Continuous merge : réconcilier feature branching et continuous delivery
Cette présentation offre des solutions tangibles au continuous delivery, qui couvrent le versionnement du code, la gestion des développements parallèles et le déploiement des artefacts. Ces solutions s’articulent autour du “continuous merge”, rendu possible grâce à l’outil open-source “git-octopus” développé chez LesFurets.com. Le continuous merge est une pratique issue de nos 2 années de daily delivery et nous permet de détecter en amont les problèmes de merge entre les branches et de les résoudre rapidement. Cette pratique nous permet de livrer en production tous les jours sans sacrifier de qualité et sans alourdir le processus de développement.