多个敏捷团队之间的版本控制.pdfVIP

Agile version control with multiple teams Taking the pa in o u t of b ranchi ng m erg ing henrik.kniberg crisp.se Version 1.2, 2008-04-04 Introduction 2 Purpose of this paper 2 Who is this paper for? 2 Disclaimer 2 Goals 2 Single page summary (for wall mounting) 3 The version control pattern 4 Branch owner policy 4 The “done” concept 4 The Done branch 4 When do we create additional branches? 5 Work branches 6 Publishing from work to trunk 7 What if our team implements multiple stories in parallell? 8 Done includes regression testing ! 10 Diverging code (merging conflicts) 11 Multiple teams - what if other teams are publishing to the trunk as well? 12 Release branches 15 The big picture 16 Variations to the model 20 FAQ 21 Where does continuous integration (CI) fit into this? 21 What’s the best tool for this version control model? 21 What about checkins that aren’t related to a user story? 21 Merging is a pain, so I want to do it as seldom as possible! 21 I have more questions ! 21 References 22 Brought to you /articles/agile-version-control Courtesy of Agile version control with multiple teams Henrik Kniberg Introduction Purpose of this paper If we have several agile development teams working on the same codebase, how do we minimize the risk of stumbling over each other? How do we ensure that there always is a clean, releasable version at