[Ncep.list.fv3-announce] GitHub: new "fetch upstream" button for syncing forks easily/fast!

[Kate Friedman - NOAA Federal]

All,

A follow-up on this feature...some users are also using GitHub Actions
(free) to set up similar syncing in their forks. Below is an example
that Guoqing Ge at EMC has been using successfully, which I wanted to share
with others:

Github provides free "actions" so that we can let Github do the upstream
> sync fully automatically without the user's involvement. It may be useful
> for some group repos which need frequent sync. I set up an action at
> comgsi/GSI to sync its master branch with NOAA-EMC/GSI twice a day and it
> has been working very well for about a year now.



The action code is simple and you may check them here:
> https://github.com/comgsi/GSI/blob/DTC/.github/workflows/syncEMC.yml


I have not extensively worked with Actions yet so users who want to explore
them should refer to the GitHub documentation:

https://github.com/features/actions
https://docs.github.com/en/actions

I encourage folks to share similar success stories and examples in their
Slack or other similar discussion channels. Thanks!

Kate Friedman (formerly Howard) (she/her)
NOAA/NWS/NCEP/EMC Engineering and Implementation Branch


On Wed, May 19, 2021 at 12:18 PM Kate Friedman - NOAA Federal <
Kate.Friedman at noaa.gov> wrote:

> All,
>
> For those who have not yet noticed, there is a cool new feature in GitHub
> which helps you keep your fork branches up-to-date with the authoritative
> repository. The "Fetch upstream" dropdown (found under the big green "Code"
> button) allows you to either "Compare" (compare with upstream) or "Fetch
> and merge" (fetch upstream and merge into your fork) or "Open pull
> request". Below is a screenshot showing the popup after clicking on the
> "Fetch upstream" button in my fork of global-workflow. I already used the
> button to sync my fork's develop branch so there isn't anything to do
> anymore so the buttons are now disabled:
>
> [image: image.png]
>
> It also works for branches other than the main develop branch. Here I show
> that my fork's operations branch is behind the auth repo copy and I can hit
> the green "Fetch and merge" button to update it automatically:
>
> [image: image.png]
>
> If I am on a feature branch that doesn't exist in the auth repo then that
> "Fetch upstream" dropdown gives me the option to open a pull request for my
> branch and notes that conflicts exist (I will have to perform a sync merge
> manually first to resolve conflicts):
>
> [image: image.png]
>
> It looks like conflicts will still have to be resolved manually but
> conflict-free merges can now be completed automatically with this feature.
> So save yourself some time and try out this new feature! :)
>
> Kate Friedman (formerly Howard) (she/her)
> NOAA/NWS/NCEP/EMC Engineering and Implementation Branch
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.lstsrv.ncep.noaa.gov/pipermail/ncep.list.fv3-announce/attachments/20210520/e63d1c7a/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: image.png
Type: image/png
Size: 349204 bytes
Desc: not available
URL: <https://www.lstsrv.ncep.noaa.gov/pipermail/ncep.list.fv3-announce/attachments/20210520/e63d1c7a/attachment-0003.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: image.png
Type: image/png
Size: 339017 bytes
Desc: not available
URL: <https://www.lstsrv.ncep.noaa.gov/pipermail/ncep.list.fv3-announce/attachments/20210520/e63d1c7a/attachment-0004.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: image.png
Type: image/png
Size: 330692 bytes
Desc: not available
URL: <https://www.lstsrv.ncep.noaa.gov/pipermail/ncep.list.fv3-announce/attachments/20210520/e63d1c7a/attachment-0005.png>