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.

Sign up for GitHub

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

Jump to bottom

Periodical merge #705

Merged
merged 24 commits into from
Jul 19, 2024
Merged

Periodical merge #705

merged 24 commits into from
Jul 19, 2024

Conversation

atteggiani
Copy link
Contributor

Periodical merge of development into main.

flicj191 and others added 24 commits June 19, 2024 12:36
@flicj191
reorganise MED navigation and clean up
4e8cc89
@flicj191
move files and reorganise
50e4666
@flicj191
fix link and capitals
62475b6
@flicj191
clean up ilamb and cards
b5dc0d8
@flicj191
Styling model evaluation pages
944c5aa
@flicj191
remove tools in dev
e7de575
@flicj191
restructure file moves and names and some editing
0906616
@flicj191
format and variable edits
c3e0d57
@flicj191 @paigem
Apply suggestions from review on data pages
746c0ef 
Co-authored-by: Paige Martin <[email protected]>
@flicj191
format and variables review edits
6e35051
@flicj191
code styling
19d221b
@flicj191
review edits
15ab2ef
@flicj191
some rewording
d8d3e20 
rewording
@flicj191 @paigem
Apply suggestions from Paige's evaluation review
c49b866 
Co-authored-by: Paige Martin <[email protected]>
@flicj191
edit to address review comments
17b1a1f
@flicj191
update links and review text
bb15dcf
@flicj191
spelling and clarify
bc195b6
@flicj191
add original changes to ilamb
9e839b5
@atteggiani
Merge pull request #663 from ACCESS-NRI/flick/525-MEDReview
bd572c7 
MED review and restructure
@atteggiani
Added warning about syncing laboratory directory in how-to-run-ACCESS…
138a5e0 
…-OM to make it clearer. Minor modificiations
@atteggiani
Updated by revising Anton's suggestions.
9cf34d2 
Updated by revising Anton's suggestions.
@atteggiani
Merge pull request #703 from ACCESS-NRI/699-make-turn-on-sync-in-run-…
acc823f 
…access-om2-instructions-more-obvious

Make syncing laboratory directory clearer before running ACCESS-OM
@blimlim
Change ESM1.5 cice version to 4.1
8bc3511
@atteggiani
Merge pull request #704 from ACCESS-NRI/700-update-esm1.5-cice-version
d937e08 
Change ESM1.5 cice version to 4.1
@atteggiani atteggiani requested a review from a team July 17, 2024 01:44
@github-actions GitHub Actions
Copy link

github-actions bot commented Jul 17, 2024 •
edited
Loading

Development website preview
🛬 Preview removed because the pull request was closed.
2024-07-19 11:42 AEST

flicj191
flicj191 approved these changes Jul 17, 2024
View reviewed changes
Copy link
Contributor

@flicj191 flicj191 left a comment

Choose a reason for hiding this comment

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

Thanks!
not sure why it's out of date from main though but fine to update

@atteggiani
Copy link
Contributor Author

Thanks! not sure why it's out of date from main though but fine to update

What do you mean?

@flicj191
Copy link
Contributor

Thanks! not sure why it's out of date from main though but fine to update

What do you mean?

just below the checks it just says the branch is out of date with main. just needs to be updated to merge

@atteggiani
Copy link
Contributor Author

Thanks! not sure why it's out of date from main though but fine to update

What do you mean?

just below the checks it just says the branch is out of date with main. just needs to be updated to merge

Yeah I see.
I think that happens because there are commits in main which are not present in development, but there are no file changed. The only difference in the history (before the current main HEAD) seems to be the merge commit 63da5242d6d8d6d6cf2545d9904527644567c84d related to #690:

$ git log development..main

commit 63da5242d6d8d6d6cf2545d9904527644567c84d (origin/main, origin/HEAD, main)
Merge: a6f1023 ed4e650
Author: Davide Marchegiani <[email protected]>
Date:   Thu Jun 6 10:32:07 2024 +1000

Merge pull request #690 from ACCESS-NRI/development

Periodical merge

Not sure why this is happening, but I would not worry for now.

@atteggiani atteggiani merged commit 233a1a3 into main Jul 19, 2024
12 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flicj191 flicj191 flicj191 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@atteggiani @flicj191 @blimlim