Version Control Tips, Tricks and Good Citizenship

Discover essential version control strategies and best practices in this PHP UK Conference talk. Learn how to navigate complex team workflows, resolve conflicts efficiently, and implement effective branching policies. Explore advanced techniques for managing multiple branches, integrating version control with other tools, and automating processes to streamline your development workflow. Gain insights into enforcing commit message formats, automating changelogs, and improving code review processes. Uncover the power of hooks, authorization solutions, and tools for handling large codebases. Master the art of creating lazy changelogs and keeping team members informed. Elevate your version control skills and become a better team player in your development projects.

Intro
Tess Barnes
Basic levels
Bonus levels
Minor conflict resolution
Interleaved causes
Fixing add conflicts
Fixing delete conflicts
Missing files trying to apply change to non existent file
Avoiding missing files
here's why
Get out of jail free
Why just fix?
VC tree bonsai
Branching strategy
Coping with complexity
Script Examples
What is a hook?
Why enforce authorisation
Authorisation solutions
What if you use git?
Enforcing code review two heads are better than one
Why use tools with this?
How do we automate?
Getting outside help
Enforcing standards making it easier to handle... HUNDREDS OF LINES OF CODE
TortoiseSVN example
server hook example
Creating change logs the lazy way
Lazy change logs
Validate commit messages Check min length Pattern match
scrape details from svn log
Publish those logs
Keep everyone in the loop
Start a revolution