GEOS-5 Software Engineering: Difference between revisions
| Line 50: | Line 50: | ||
There are two basic approaches to perform configuration management under CVS: | There are two basic approaches to perform configuration management under CVS: | ||
# | # Two separate bracnches | ||
#* Development branch - free for all | #* Development branch - free for all | ||
#* Production bracnch: lead custodian merges dev->prod | #* Production bracnch: lead custodian merges dev->prod | ||
# Single branch approach (GMAO approach) | # Single branch approach (GMAO approach) | ||
#* Individual developers commit mods to 'development' branch | #* Individual developers commit mods to 'development' branch | ||