ci: update-flake: preserve existing commits on branch#2262
Open
0xda157 wants to merge 1 commit intonix-community:masterfrom
Open
ci: update-flake: preserve existing commits on branch#22620xda157 wants to merge 1 commit intonix-community:masterfrom
0xda157 wants to merge 1 commit intonix-community:masterfrom
Conversation
Contributor
0xda157
commented
Apr 3, 2026
0xda157
commented
- I certify that I have the right to submit this contribution under the MIT license
- Commit messages adhere to Stylix commit conventions
- Theming changes adhere to the Stylix style guide
- Changes have been tested locally
- Changes have been tested in testbeds
- Each commit in this PR is suitable for backport to the current stable branch
prevents this workflow from pushing over existing commits, as was encountered in nix-community#2180 Link: nix-community#2180
0xda157
added
topic: ci
trueNAHO
requested changes
Apr 3, 2026
Member
trueNAHO
left a comment
trueNAHO
left a comment
There was a problem hiding this comment.
This action forcefully overriding existing manual changes has also been bothering me for a while. However, I never opened a PR for this because resolving the pulled breaking changes usually does not take long and the occasional override is not huge problem. Unfortunately, the long-pending #2180 update breaks this assumption with its non-trivial breaking changes.
Considering this PR is fairly low-priority, I can also take over this PR next week.
| env: | ||
| base_branch: ${{ matrix.branch }} | ||
| run: | | ||
| git pull origin "$base_branch" --rebase |
Member
There was a problem hiding this comment.
Does this not break when $base_branch does not exist yet? Maybe the later pr_count logic can be used here? Unsure whether this can be neatly implemented without duplicating a pr_count guard.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.