update apps kgo instructions #258
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jennyhickson
reviewed
Oct 4, 2024
source/Reviewers/howtocommit.rst
Outdated
| @@ -464,15 +464,19 @@ for all affected tests before you commit to the trunk. | |||
| latter case, the update will need redoing by the reviewer before commit | |||
| if there are merge conflicts in the checksum files. | |||
|
|
|||
| 1. Run the rose stem tasks that require a KGO update, plus any other testing required (see above) - if unsure run the `all` group. | |||
| 1. Fix any merge conflicts in the checksums - select the "Working" panel of the merge to keep the kgo files that are currently on trunk. | |||
There was a problem hiding this comment.
I'm not sure about including the instruction to select "working" since people use different conflict resolution tools, and you're about to overwrite the file so it doesn't matter which you select. Maybe swap it for something saying that it doesn't matter?
There was a problem hiding this comment.
Yep fair point, have modified
jennyhickson
approved these changes
Oct 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A clarification on instructions for committing LFRic Apps kgo changes in response to issues found by reviewers.