Skip to content

Release candidate

Hunsinger, Heather Elizabeth requested to merge release-candidate into main

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:

  1. get the release candidate branch: git fetch upstream release-candidate
  2. checkout release candidate branch: git checkout release-candidate
  3. make a new branch off of it to address the specific review/issue: git checkout -b fortran-code-review
  4. make changes and push the working branch: git push origin fortran-code-review
  5. 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:

  1. checkout release candidate branch: git checkout release-candidate
  2. pull the changes I want to get: git pull --ff-only upstream release-candidate
  3. checkout working branch: git checkout fortran-code-review
  4. rebase: git rebase release-candidate
  5. push changes: git push origin fortran-code-review (might need the --force flag)
Edited by Hunsinger, Heather Elizabeth

Merge request reports