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

Attempt to automatically keep PRs updated #3

Closed
Jake-Shadle opened this issue Jan 20, 2021 · 1 comment
Closed

Attempt to automatically keep PRs updated #3

Jake-Shadle opened this issue Jan 20, 2021 · 1 comment
Labels
enhancement New feature or request

Comments

@Jake-Shadle
Copy link
Member

It's useful to keep a PR updated with the branch it is going to be merged into, Github supports merging from the base branch as a preview feature, but doesn't support rebasing, so the easiest would just be to support both in the bot. This could either use the CLI or libgit2, though I would lean towards the CLI since it would 0 extra compile time/binary size for something that is (probably) available in the action environment.

@Jake-Shadle Jake-Shadle added the enhancement New feature or request label Jan 20, 2021
@bnjbvr
Copy link
Contributor

bnjbvr commented Mar 4, 2021

+1 to this; maybe a slightly different, simpler feature would be to try to rebase once the PR has been approved, just before a merge? (And comment if automatic rebase can't be done.)
This would avoid merge skew (see also) and make sure that green CI on PR implies the CI is green on main too.

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

No branches or pull requests

2 participants