- short lived branches
- merge as soon after the change as you can
- tests make you safe
- automated merge procedure
- author takes responsibility for merging if fails automated procedure
- code consists of small classes / methods and has good separation of concerns (thanks to Felix Leipold for that one)
Easy streets merging with SVN
Friday 23 January 2009
I was thinking about merging today - what rules represent safe and easy merging - the more I can apply the easier my life would be. This is what I came up with:
Subscribe to:
Post Comments
(
Atom
)
2 comments :
Make the smallest changes possible to achieve your aims on the branch, I.e. Don't make unnecessary small changes (code formatting, removing compiler warnings) or large refactorings (move / rename class / package). Trying to avoid deleting files.
Oh yeah, that's a good one i should have included. Refactor on truck.
Post a Comment