Repository navigation
CTSM glaciers documentation - #4062
Merged
slevis-lmwg merged 9 commits intoNov 17, 2026
Merged
Conversation
1 of 8 tasks
Contributor
|
Looks like there are conflicts to be resolved first, presumably desirable before my review. |
olyson
requested changes
Jun 3, 2026
Contributor
Contributor
added 2 commits
November 7, 2026 12:53
…M into ctsm_glaciers_documentation
Contributor
|
@minallah , there are merge conflicts here that should be resolved before I re-review this. You could try clicking the "Resolve conflicts" button or do it manually from the command line. |
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
slevis-lmwg
self-requested a review
November 17, 2026 20:32
Contributor
|
@minallah I reverted @ekluzek's changes that conflicted with yours. I think this means that we just need @olyson's final approval now to merge your PR to the b4b-dev branch. @ekluzek in the last two commits you can see which of your mods we removed because we considered the conflicts unresolvable otherwise. If you have a quick look, you may decide that your changes now belong elsewhere in the file, in which case I suggest a new PR if you don't mind. |
This file contains hidden or 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
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.
Description of changes
Updates to CTSM documentation chapter on Glaciers
Specific notes
Contributors other than yourself, if any:
Requirements before merge: