Skip to content
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

Add comments after ocn_cpl_dt in nuopc.runconfig #95

Merged
merged 1 commit into from
Aug 7, 2024

Conversation

minghangli-uni
Copy link

Copy link
Contributor

@aekiss aekiss left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @minghangli-uni

@minghangli-uni minghangli-uni merged commit 18d4dbb into 1deg_jra55do_ryf Aug 7, 2024
@minghangli-uni
Copy link
Author

!cherry-pick ad59cb2 into 1deg_jra55do_iaf 0.25deg_jra55do_ryf

Copy link

github-actions bot commented Aug 7, 2024

!cherry-pick ad59cb2 into 1deg_jra55do_iaf 0.25deg_jra55do_ryf

Automatic cherry-pick failed. Could not find commit(s) ad59cb2 in 1deg_jra55do_ryf.

@aekiss
Copy link
Contributor

aekiss commented Aug 7, 2024

you need to use the merge/rebase commit hash, i.e. 18d4dbb

@minghangli-uni
Copy link
Author

!cherry-pick 18d4dbb into 1deg_jra55do_iaf 0.25deg_jra55do_ryf

Copy link

github-actions bot commented Aug 7, 2024

!cherry-pick 18d4dbb into 1deg_jra55do_iaf 0.25deg_jra55do_ryf

Automatic cherry-pick failed. Could not find commit(s) https://github.com/COSIMA/MOM6-CICE6/commit/18d4dbb18944e67ccb24869c9d70950821219645 in 1deg_jra55do_ryf.

@minghangli-uni
Copy link
Author

minghangli-uni commented Aug 7, 2024

!cherry-pick 18d4dbb into 1deg_jra55do_iaf 025deg_jra55do_ryf

Copy link

github-actions bot commented Aug 7, 2024

!cherry-pick 18d4dbb into 1deg_jra55do_iaf 0.25deg_jra55do_ryf

Automatic cherry-pick failed. Could not find branch(es) 0.25deg_jra55do_ryf in repository.

@minghangli-uni
Copy link
Author

!cherry-pick 18d4dbb into 1deg_jra55do_iaf 025deg_jra55do_ryf

Copy link

github-actions bot commented Aug 7, 2024

Automatic Git cherry-picking of commit(s) 18d4dbb into 025deg_jra55do_ryf failed. This usually happens when cherry-picking results in a conflic or an empty commit. To manually cherry-pick the commits and open a pull request, please follow these instructions:

  1. Create new branch from target branch:
git checkout 025deg_jra55do_ryf
git pull
git checkout -b cherry_pick_from_pr95_into_025deg_jra55do_ryf
  1. Cherry-pick commits:
git cherry-pick 18d4dbb
  1. Fix any conflicts and/or empty commits by following the instructions provided by Git.
  2. Push the new branch:
git push --set-upstream origin cherry_pick_from_pr95_into_025deg_jra55do_ryf
  1. Open a new pull request on github making sure the target branch is set to 025deg_jra55do_ryf.

Copy link

github-actions bot commented Aug 7, 2024

Automatic Git cherry-picking of commit(s) 18d4dbb into 1deg_jra55do_iaf failed. This usually happens when cherry-picking results in a conflic or an empty commit. To manually cherry-pick the commits and open a pull request, please follow these instructions:

  1. Create new branch from target branch:
git checkout 1deg_jra55do_iaf
git pull
git checkout -b cherry_pick_from_pr95_into_1deg_jra55do_iaf
  1. Cherry-pick commits:
git cherry-pick 18d4dbb
  1. Fix any conflicts and/or empty commits by following the instructions provided by Git.
  2. Push the new branch:
git push --set-upstream origin cherry_pick_from_pr95_into_1deg_jra55do_iaf
  1. Open a new pull request on github making sure the target branch is set to 1deg_jra55do_iaf.

minghangli-uni added a commit that referenced this pull request Aug 7, 2024
* Add comments after ocn_cpl_dt in nuopc.runconfig - COSIMA/access-om3#157 (#95)

* Update nuopc.runconfig

Co-authored-by: Andrew Kiss <31054815+aekiss@users.noreply.github.com>

---------

Co-authored-by: Andrew Kiss <31054815+aekiss@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants