for_developers:releaseprocess
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
| for_developers:releaseprocess [2024/12/18 11:32] – [7. Merge the commits on the release branch into the master branch] ursgraf | for_developers:releaseprocess [2026/04/22 10:54] (current) – [8. Generate the API documentation with Doxygen] ursgraf | ||
|---|---|---|---|
| Line 48: | Line 48: | ||
| Probably you already have a release branch, e.g. do want to release v1.0.3 and still have your branch for v.1.0.2. If so, switch to branch v1.0 and **merge your master branch** (or whatever work you want to be included) into the release branch. | Probably you already have a release branch, e.g. do want to release v1.0.3 and still have your branch for v.1.0.2. If so, switch to branch v1.0 and **merge your master branch** (or whatever work you want to be included) into the release branch. | ||
| + | < | ||
| + | git checkout v1.0 | ||
| + | git merge master | ||
| + | </ | ||
| + | |||
| ==== 3. Creation of a new Jenkins item for the new release branch | ==== 3. Creation of a new Jenkins item for the new release branch | ||
| Line 135: | Line 140: | ||
| < | < | ||
| - | ... eeros-framework/ | + | ... eeros-framework/ |
| </ | </ | ||
for_developers/releaseprocess.1734517930.txt.gz · Last modified: by ursgraf