Source Code Management AKA Configuration Management Or How I learned to Stop Worrying (As Much) and Hate My Co-workers Less

Merging


•	Several people can work on a file at once

•	Before committing changes, each user

	merges their copy with the latest copy in the

	database

–	This is normally done automatically by the

	system and usually works, but you should

	not blindly accept the result of the merge