| | 49 | == Merging changes == |
| | 50 | Now that we have a separate CABB branch, we need to make sure it doesn't get too far out of date with the main branch of miriad. |
| | 51 | Periodically check for changes of checked out code (e.g. before checkin) and merge in changes from the main branch were possible. |
| | 52 | {{{ |
| | 53 | unix% co -l -rcabb atlod.for % check out the latest cabb branch version of atlod |
| | 54 | unix% vi atlod.for % make some cabb related changes |
| | 55 | unix% rlog atlod.for % gives the revision history on both branches |
| | 56 | unix% rcsmerge -r1.8 atlod.for % merges changes from 1.8 (assumed to be the most recent) into the checked out version |
| | 57 | unix% ci -rcabb atlod.for -m"cabb changes, changes from 1.8 merged in" % make a note of the merge in the log message |
| | 58 | }}} |
| | 59 | |
