-
Notifications
You must be signed in to change notification settings - Fork 216
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make Flgl_qice attname consistent with name #1662
Conversation
@apcraig as the assignee you are responsible for merging the PR. If you would rather not do that you can reassign. |
I have not done a PR on escmi and don't know the process. I'll merge it if you want. It's it just "click" the "Merge pull request" button? If it's more than that, maybe somebody else can take it. |
Thanks, @apcraig and @jedwards4b @apcraig - for future reference: it's just a matter of clicking the Merge pull request button, then copying and pasting the original PR comments into the message box, so that they get incorporated in the git log history. |
After the copy, you should replace references to ESMCI issues (e.g., Fixes #1660) with something explicit (e.g., Fixes ESMCI/CIME issue 1660) so that the git log, which ends up in other repos (e.g., ACME, CESM-Development) don't refer to the wrong issue number. |
Adding support for ANL Bebop cluster. [BFB] Conflicts: cime/config/acme/machines/config_batch.xml
Adding support for ANL Bebop cluster. (Re-merge of the branch was required because the previous merge missed a commit - 8aad11e ) [BFB]
Adding support for ANL Bebop cluster. [BFB] Conflicts: cime/config/acme/machines/config_batch.xml
Adding support for ANL Bebop cluster. (Re-merge of the branch was required because the previous merge missed a commit - 8aad11e ) [BFB]
Adding support for ANL Bebop cluster. [BFB] Conflicts: cime/config/acme/machines/config_batch.xml
Adding support for ANL Bebop cluster. (Re-merge of the branch was required because the previous merge missed a commit - 8aad11e ) [BFB]
Test suite: ./create_test cime_developer on yellowstone
Test baseline: N/A
Test namelist changes: none
Test status: bit for bit
Fixes #1660
User interface changes?: none
Code review: