Determine whether automerging can be made to work when fork branches are behind as well as ahead of main

CDCgov / covid19-forecast-hub

A repository run by the US CDC to collect forecast data for the weekly new COVID-19 hospitalizations.

Apache License 2.0

6 stars 9 forks source link

Determine whether automerging can be made to work when fork branches are behind as well as ahead of main #77

Open dylanhmorris opened 1 week ago

dylanhmorris commented 1 week ago

If not, add guidance to make sure branch is strictly ahead of main for PR automerge

Compare: https://github.com/CDCgov/covid19-forecast-hub/actions/runs/11945156368 (failed) https://github.com/CDCgov/covid19-forecast-hub/actions/runs/11945068385 (succeeded)

sbidari commented 1 week ago

I have not found a way to make automerge work when fork branches are behind main, I can look into it more but I think the easiest thing to do at least for now is enable Always suggest updating pull request branches in the repo settings which will suggest teams to sync their branch with main if it's behind.

dylanhmorris commented 1 week ago

Makes sense. I would also add a note to the documentation in the same area as the bit on automerging

dylanhmorris commented 1 week ago

@sbidari added notes in #87. I think we should keep this open for a little while to explore whether things can work more automatically with reconcilable (but divergent) branches.

sbidari commented 1 week ago

I agree!