E3SM-Project / CMIP6-Metadata

0 stars 0 forks source link

Add v1 LE ssp370 metadata #19

Closed TonyB9000 closed 1 year ago

TonyB9000 commented 1 year ago

Created 20 ssp370 metadata files. Says "Can't automatically merge". Too Bad.

chengzhuzhang commented 1 year ago

@TonyB9000 I think you should create Pull request from master.

TonyB9000 commented 1 year ago

I switched from my local branch to my master branch, did a pull (“All is up to date”), brought over the new ssp370 files, did a git add, git commit, and a git push.

But I don’t know how to create a PR for master – the “PR” button is grayed out:

[A screenshot of a computer Description automatically generated with medium confidence]

tony

From: Jill Chengzhu Zhang @.> Sent: Friday, June 2, 2023 9:07 AM To: E3SM-Project/CMIP6-Metadata @.> Cc: Bartoletti, Tony @.>; Mention @.> Subject: Re: [E3SM-Project/CMIP6-Metadata] Add v1 LE ssp370 metadata (PR #19)

@TonyB9000https://urldefense.us/v3/__https:/github.com/TonyB9000__;!!G2kpM7uM-TzIFchu!1krrgu2jnUJtMp74rlHTc8sWJeVgmPVWej1kZTICvp7vOG_TARqmWSwcY8udfsVNiZBWVsZmd923CG9a1tDDAA$ I think you should create Pull request from master.

— Reply to this email directly, view it on GitHubhttps://urldefense.us/v3/__https:/github.com/E3SM-Project/CMIP6-Metadata/pull/19*issuecomment-1573975356__;Iw!!G2kpM7uM-TzIFchu!1krrgu2jnUJtMp74rlHTc8sWJeVgmPVWej1kZTICvp7vOG_TARqmWSwcY8udfsVNiZBWVsZmd923CG8REuqYAw$, or unsubscribehttps://urldefense.us/v3/__https:/github.com/notifications/unsubscribe-auth/ANZBCGRBJJFNT7RR2G7FLGLXJIFT5ANCNFSM6AAAAAAYYO5CVA__;!!G2kpM7uM-TzIFchu!1krrgu2jnUJtMp74rlHTc8sWJeVgmPVWej1kZTICvp7vOG_TARqmWSwcY8udfsVNiZBWVsZmd923CG88Li5gaw$. You are receiving this because you were mentioned.Message ID: @.***>

chengzhuzhang commented 1 year ago

This branch is problematic, it is not based off master. You can click on Resolve conflicts to see the conflicts and try to fix.

TonyB9000 commented 1 year ago

I decided to close this PR, and grab the latest "historical" files first. This should avoid the conflict, right?