Difference between revisions of "Nice Version Control"

From FreekiWiki
Jump to navigation Jump to search
(initial (non) content)
 
(actual content)
Line 1: Line 1:
basic guidelines for working with others in a revision control system.
+
very basic and generic guidelines for working with others using a revision
 +
control system:
 +
 
 +
update your working copy before modifying anything
 +
 
 +
always diff before you commit, to avoid committing anything unintentionally
 +
 
 +
commit smaller, logically grouped changes together- this makes it easier to
 +
revert a specific change without reverting unrelated stuff, too.
 +
 
 +
avoid conflicts when possible by knowing who's working on what parts
 +
 
 +
when implementing major changes, check in with others working on the project
 +
 
 +
try to implement major changes in a branch first
 +
 
 +
keep branches in sync, to make it easier to merge back into mainline
 +
 
 +
[[Category:Coders]]

Revision as of 08:19, 30 August 2005

very basic and generic guidelines for working with others using a revision control system:

update your working copy before modifying anything

always diff before you commit, to avoid committing anything unintentionally

commit smaller, logically grouped changes together- this makes it easier to revert a specific change without reverting unrelated stuff, too.

avoid conflicts when possible by knowing who's working on what parts

when implementing major changes, check in with others working on the project

try to implement major changes in a branch first

keep branches in sync, to make it easier to merge back into mainline