Back to [[conference:committee:2015-proposals]]\\ \\ **Title**: Git Branching Models That Scale\\ **Proposer**: [[2015:Lee Winder]]\\ **Type**: Case Study\\ **Duration**: 90 mins\\ **Description**: \\ DVCS tools are often seen as complex and difficult to use, seen as extremely powerful but lacking the features - be that exclusive check-out, usable client tools or simplicity - that restricts it's ability to scale as both team sizes and projects increase in size. \\ \\ This talk aims to challenge those ideas through real life examples of how we used Git at scale, for example by using structured branch histories, managed branch merging, additional tools to supplement our workflow and by carrying out detailed education in how the toolset works.\\ \\ It will show attendees that using the correct branching model not only works at scale but that it can actively improve workflow, productivity and stability through processes such as isolated feature and bug development, pull requests, feature branching and cherry picking. These areas will be of interest to a significant number of people attending the conference as it can impact their work on a day-to-day basis. \\ \\ The talk will cover the following topics\\ * Our branching model, based on iteration on the standard or accepted ways to use Git\\ * When to use Git in conjunction with other tools when needed\\ * The branching strategy we use for both new features, modifications, bug fixing and quality control\\ * How different strategies can be used to meet the needs of programmers, artists and other disciplines within a team\\ * Using Pull Requests to improve build stability and drive the quality of the final product\\ * The lessons and ideas of using DVCS with larger teams\\ \\ \\ \\