NOAA-EMC / global-workflow

Global Superstructure/Workflow supporting the Global Forecast System (GFS)
https://global-workflow.readthedocs.io/en/latest
GNU Lesser General Public License v3.0
70 stars 161 forks source link

Update dev/gdasapp with develop #2714

Closed RussTreadon-NOAA closed 6 days ago

RussTreadon-NOAA commented 6 days ago

Description

This PR updates dev/gdasapp with develop

Type of change

Change characteristics

How has this been tested?

Checklist

RussTreadon-NOAA commented 6 days ago

Assign @CoryMartin-NOAA and @guillaumevernieres as reviewers to see if their reviews & approvals are sufficient for one of us to merge this PR into dev/gdasapp.

RussTreadon-NOAA commented 6 days ago

Thank you @guillaumevernieres . Your approval unlocked the merge button! Let me go ahead and update dev/gdasapp.

RussTreadon-NOAA commented 6 days ago

Question for @aerorahul , @WalterKolczynski-NOAA , @CoryMartin-NOAA , and @guillaumevernieres .

We have two merge options for this PR, #2714:

  1. squash and merge
  2. rebase and merge

Which one should I select?

I'm thinking ahead to when dev/gdasapp contains GDASApp changes to merge into develop. Which of the above merge options for this PR, #2714, will cause the least trouble when we get to this future scenario?

guillaumevernieres commented 6 days ago

Rebase and merge @RussTreadon-NOAA we don't want to squash the commits coming from develop. But happy to hear from others.

RussTreadon-NOAA commented 6 days ago

The rebase & merge is complete but I don't what I see for dev/gdasapp. github says the branch is 19 commits ahead and behind of develop.

guillaumevernieres commented 6 days ago

The rebase & merge is complete but I don't what I see for dev/gdasapp. github says the branch is 19 commits ahead and behind of develop.

The log history is the same but the commit # don't match, oops ... Let me try to do a reset to develop and submit that as a pr.