Tess is a multi language developer at Fasthosts, an active participant in their PHPGuild and an advocate of agile principles. She spends most of her day writing, refactoring, reviewing, discussing and documenting code. In spare time she plays with ORMs, occasionally blogs at http://blog.tessbarnes.uk, sings with a covers band and spends time with her family. She relaxes by training in martial arts.

@crataegustess

Talk: Version Control - Tips, Tricks and Good Citizenship

Are you nervous of version control even if you don’t admit it? Have things got harder since your team expanded? Don’t panic! you’re not on your own. Tess has put together a run down of some of her tricks, tips and “good citizen” techniques to avoid the worst kinds of conflicts and deal with the remaining ones as efficiently as possible.