Ensuring product quality and engineering productivity in an Agile environment with numerous concurrent branches can be challenging. In this presentation, Yi Zhang of EMC will share his team's branch management lessons and discuss the merge tool they've developed based on P4PERL. Hear how EMC leverages this tool to try and achieve great code quality and high engineering productivity at the same time.