Feature/gfsv16b #147
Closed
Feature/gfsv16b #147
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There is a conflict now. You need to resolve it. |
|
Will do that after two meetings this morning.
…On Mon, Oct 5, 2020 at 10:30 AM Fanglin Yang ***@***.***> wrote:
There is a conflict now. You need to resolve it.
—
You are receiving this because you were assigned.
Reply to this email directly, view it on GitHub
<#147 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ALQGQJGVMQRR5ICZXOTGKODSJHJ7TANCNFSM4SCJ7BRQ>
.
|
|
Kate, in the current PR, it says there is a conflict need to be resolved. If I open another PR to feature/gfsv16b_updates, do I have resolve this conflict first? Or just open a PR and use my current Fork. |
|
@GuangPingLou-NOAA Please sync your fork's branch with feature/gfsv16b_updates, resolve any conflicts in your sync merge on your end and then submit the PR to feature/gfsv16b_updates. Thanks! See guidance on syncing your branch if needed here: |
kayeekayee
pushed a commit
to kayeekayee/global-workflow
that referenced
this pull request
May 30, 2024
…0/07/21) (NOAA-EMC#147) - remove `include ./depend` from several GNU makefiles (from @DusanJovic-NOAA) - correct CCPP version number in several suite definition files - GFS_typedefs.F90: allow using `iopt_snf == 4` for other microphysics schemes than GFDL MP (required for RRFS, needs NoahMP and Thompson)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add 6 bufr stations to the bufr sounding output per requests from Thailand Meteorological Department. This corresponds to Issue #142.
Change module paths from dev to prod for bufr sounding package and this relates to issue #145.