Skip to content

CTSM glaciers documentation - #4062

Merged
slevis-lmwg merged 9 commits into
ESCOMP:b4b-devfrom
minallah:ctsm_glaciers_documentation
Nov 17, 2026
Merged

slevis-lmwg merged 9 commits into
ESCOMP:b4b-devfrom
minallah:ctsm_glaciers_documentation

Conversation

@minallah

@minallah minallah commented May 28, 2026 •

Copy link
Copy Markdown

Description of changes

Updates to CTSM documentation chapter on Glaciers

Specific notes

Contributors other than yourself, if any:

  • None

Requirements before merge:

@wwieder wwieder linked an issue May 28, 2026 that may be closed by this pull request
1 of 8 tasks
@wwieder
wwieder requested a review from olyson May 28, 2026 22:00
@olyson

olyson commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

Looks like there are conflicts to be resolved first, presumably desirable before my review.

@olyson olyson left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this @minallah , looks pretty good, but see my comments.

Comment thread .gitignore Resolved
Comment thread .gitignore Resolved
@slevis-lmwg slevis-lmwg added documentation additions or edits to user-facing documentation or its infrastructure b4b bit-for-bit docs:update Significant update or fix needed to existing documentation docs-loc:tech-note Relates to Technical Note (science) labels Jun 8, 2026
@slevis-lmwg slevis-lmwg moved this to In review in CLM documentation Jun 8, 2026
@wwieder

wwieder commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

@minallah are you able to address @olyson's reviews so we can merge this PR?

@wwieder

wwieder commented Oct 29, 2026

Copy link
Copy Markdown
Contributor

@minallah do you need help addressing @olyson's comments?

@wwieder
wwieder requested a review from olyson November 9, 2026 15:56
@olyson

olyson commented Nov 10, 2026

Copy link
Copy Markdown
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.

@olyson

This comment was marked as resolved.

@github-actions

This comment was marked as resolved.

@slevis-lmwg
slevis-lmwg self-requested a review November 17, 2026 20:32
@slevis-lmwg

Copy link
Copy Markdown
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.

@olyson olyson left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@slevis-lmwg
slevis-lmwg merged commit 6fd9f42 into ESCOMP:b4b-dev Nov 17, 2026
7 checks passed
@github-project-automation github-project-automation Bot moved this from In review to Done in CLM documentation Nov 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

b4b bit-for-bit docs:update Significant update or fix needed to existing documentation docs-loc:tech-note Relates to Technical Note (science) documentation additions or edits to user-facing documentation or its infrastructure

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Review 2.13. Glaciers

4 participants