CSE 201 Chapter Notes - Chapter 6: Version Control, Opportunity Cost
Document Summary
Keep track of original code, all changes, and sharing. Commit changes back to repository with message describing changes. The server will try to merge everyone"s changes. This isn"t always what you want but most of the time it works great. Conflicting code is a problem: if software can"t merge changes, it will issue conflict. Many will punt and kick files back to person to sort out. Usually higher priority in older/released versions than adding new features. Bug fixes should affect released software and still be implemented in in-progress versions of software. Effective bug fixing depends on being able to make changes to those versions without affecting current development. By default, your version control system gives code from trunk/head. Vcs stores all code though so you can go back. This is where good commit messages come in handy. Don"t find revision to check out, fix bugs, and check back in overwriting main development cycle since version 1!