PHP UK Conference 2016 - Tess Barnes - Version Control tips, tricks and good citizenship

This talk addresses common challenges faced with version control, especially as teams grow. The speaker shares effective strategies and techniques for managing conflicts more efficiently, emphasizing both social and technical solutions. Topics include branching policies, conflict resolution, and exploring lesser-known version control features and command line tricks. The session also highlights how integrating version control with other tools can benefit team collaboration and streamline processes like code reviews, commit message formatting, and change log automation.