Closed RussTreadon-NOAA closed 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
.
Thank you @guillaumevernieres . Your approval unlocked the merge button! Let me go ahead and update dev/gdasapp
.
Question for @aerorahul , @WalterKolczynski-NOAA , @CoryMartin-NOAA , and @guillaumevernieres .
We have two merge options for this PR, #2714:
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?
Rebase and merge @RussTreadon-NOAA we don't want to squash the commits coming from develop. But happy to hear from others.
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 rebase & merge is complete but I don't what I see for
dev/gdasapp
. github says the branch is 19 commits ahead and behind ofdevelop
.
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.
Description
This PR updates
dev/gdasapp
withdevelop
Type of change
dev/gdasapp
in sync withdevelop
Change characteristics
How has this been tested?
Checklist