Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
dylanhmorris opened this issue Nov 21, 2024 · 4 comments
Assignees

Comments

@dylanhmorris
Copy link
Contributor

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
Copy link
Collaborator

sbidari commented Nov 21, 2024

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
Copy link
Contributor Author

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

@dylanhmorris
Copy link
Contributor Author

@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
Copy link
Collaborator

sbidari commented Nov 21, 2024

I agree!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants