When someone submits a change via GitHub, an Evergreen developer should follow these steps to review it:
If everything looks good:
git remote add github-evergreen https://github.com/evergreen-library-system/Evergreen.git
git checkout main && git fetch origin && git pull origin main
git fetch github-evergreen pull/[PULL_REQ_NUMBER]/head:[BRANCHNAME]
git cherry-pick -s [BRANCHNAME]
git cherry-pick -s [BRANCHNAME]~[Number of commits]..[BRANCHNAME] --edit
(for example, if you are bringing in two commits from the survey-docs branch, run git cherry-pick survey-docs~2..survey-docs) --edit
--edit
flag will permit you to edit all commit messages as they come in.git rebase -i HEAD~2
(where 2 is the number of commits you wish to combine) pick [COMMIT HASH 1] [COMMIT MESSAGE 1]
pick [COMMIT HASH 2] [COMMIT MESSAGE 2]
pick
in the second line to fixup
then save and close the file. This merges the commits and retains the first line's commit message.git log
to make sure everything looks good.git commit --amend --author="NAME <email>"
)git push origin main
git checkout rel_3_8
(where rel_3_8 is the branch for previous version)git pull
(to get the most up-to-date version of the branch)git cherry-pick main
git cherry-pick main~[Number of commits]..main
git push