resolve: conflicts for #60 (fix/token-permissions-id-20260911) - #62
Merged
Merged
Conversation
Replays the net effect of merging main into fix/token-permissions-id-20260911 with conflicts resolved in main's favour:
* guix.scm kept (main replaced the {{PROJECT_NAME}} placeholder with a real package definition; the PR's deletion was stale)
* standards reusable-workflow pins kept at main's newer revisions
Linear single commit so it satisfies required_linear_history and squash-only merge.
|
Note Currently processing new changes in this PR. This may take a few minutes, please wait... ⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Advanced Run ID: 📒 Files selected for processing (6)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| This Source Code Form is subject to the terms of the Mozilla Public | ||
| License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| file, You can obtain one at https://mozilla.org/MPL/2.0/. | ||
| file, You can obtain one at http://mozilla.org/MPL/2.0/. |
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.
Supersedes #60 (fix/token-permissions-id-20260911), which is unmergeable as it stands.
What this is
One linear commit on top of current
maincontaining exactly the net effect ofmerging
mainintofix/token-permissions-id-20260911with every conflict resolved.Linear and single-commit because the branch rules require linear history and
allow squash merges only.
Original PR: #60
Conflicts and how each was resolved
.github/workflows/governance.yml.github/workflows/hypatia-scan.yml.github/workflows/secret-scanner.ymlguix.scmWhy
guix.scmis kept, not deletedThe PR carries
fix(ci): remove erroneous squisher-corpus guix.scm placeholder.That was correct when the branch was cut — the merge-base file was a template
with unexpanded
{{PROJECT_NAME}}tokens.mainhas since replaced itwith a real package definition (name, version,
coreutils bashinputs;grep -c '{{'now returns 0). Honouring the deletion would destroy a workingfile, so main's version is kept.
Why the workflow pins stay at main's
The PR branch pins older
hyperpolymath/standardsrevisions thanmain:d7c2271181dbf2ddd135b05bc65436eeTaking the PR side would downgrade the reusable workflows by about a month.
Most of these files conflicted only because
mainadded a trailing newline onthe same last line the PR re-pinned.
Verification
Asserted before push, then re-confirmed by an independent
git ls-remote:main, 0 behindgit merge-treeagainstmainexits 0 — genuinely conflict-freestandardspin in the tree that is unreachable fromstandards/mainguix.scmpresent wherevermainhas itRemote SHA:
dea2bfe91eebNet effect on
main