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.

Sign up for GitHub

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

Jump to bottom

flakeUpdate: also pull from main branch when the update branch wasn't merged #127

Open
roberth opened this issue Mar 26, 2023 · 0 comments
Open

flakeUpdate: also pull from main branch when the update branch wasn't merged #127

roberth opened this issue Mar 26, 2023 · 0 comments

Comments

@roberth
Copy link
Member

roberth commented Mar 26, 2023

Currently the merge base remains fixed. This is ok when updates are merged regularly, but otherwise, it may produce unnecessary conflicts.
Workaround: delete the update branch and re-run the update effect.

More requirements:

  • By default, try to keep history, which can be useful for bisection.
  • Do not throw away non-bot commits.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@roberth