LooseStitch lets you create and outliner documents. Brainstorm ideas. Call friends over. Get feedback.

Separate each tag with a space: cooking recipe ingredients.

Most Popular Tags

checklistCIVMCultureGetHowIdeaslatinmarketingMythologyMythology,notesOutlinetesttheto

"I like how easy it is to use the interface. I am suggesting our graduate art school committee at Transart Institute use LooseStitch this year to track tasks for our upcoming 2008 exhibition. Thanks for making my life easier." Anne Wallace, Transart Institute

branching & merging

created by John Muth | 30/05/2008 @ 01:41 AM | 18 views
branching & merging
Rating:
(0 ratings)
{ tags:  scm, branching, merging }
why to branch: motivations
when to branch: possible strategies
never branch
cascading branches
Create a branch for each release. When the release is complete, that branch becomes the new trunk.
mainline model
The mainline or trunk always contains only and all release-ready code. Create branches to make changes. Merge changes back into the mainline as soon as feasible.
http://tinyurl.com/yc8wwa6 (doesn't show merges-back-to-mainline)
branch-per-release
branch-per-project
branch-per-developer
how to branch: P4 details
clients & client templates
Use client templates to simplify working with branches.
"client" = "workspace" = map of local files to repository files
per-branch client templates
one client template per branch
use template for branch management (create branch, merge, retire branch)
copy from template to make clients to use for dev work in the branch
per-developer-per-branch clients
create a branch
"Create a Codeline Policy to help developers decide when to check in code to a codeline and what procedures to follow before a check-in on each codeline. "
integrate changes from main to branch
integrate changes from branch to main
retire a branch
recommended reading
High-level Best Practices in Software Configuration Management http://tinyurl.com/rdsg8
Streamed Lines: Branching Patterns for Parallel Software Development http://tinyurl.com/3gsemh
SCM Patterns quick ref card (PDF) http://tinyurl.com/3g8cn6
Rate this idea:

Comments


Add a Comment:
Your Name:
Your Email:
Comment: