Release candidate
Release reviews are documented as issues: #138 #139 #140 #141 (closed)
Updates based upon the reviews should be made as merge requests to this branch (release-candidate). For example, if I were a developer working on addressing comments for the FORTRAN code review my process would be as follows:
- get the release candidate branch:
git fetch upstream release-candidate
- checkout release candidate branch:
git checkout release-candidate
- make a new branch off of it to address the specific review/issue:
git checkout -b fortran-code-review
- make changes and push the working branch:
git push origin fortran-code-review
- create a merge request
fortran-code-review
-->release-candidate
(merge when the review has been satisfied)
If I needed to pull new changes into my working branch it would look something like this:
- checkout release candidate branch:
git checkout release-candidate
- pull the changes I want to get:
git pull --ff-only upstream release-candidate
- checkout working branch:
git checkout fortran-code-review
- rebase:
git rebase release-candidate
- push changes:
git push origin fortran-code-review
(might need the--force
flag)
Edited by Hunsinger, Heather Elizabeth