Skip to content

resolve: conflicts for #90 (chore/apply-foundation-ci-fixes-20260911) - #94

Merged
hyperpolymath merged 1 commit into
mainfrom
resolve/pr-90-conflicts
Sep 18, 2026
Merged

hyperpolymath merged 1 commit into
mainfrom
resolve/pr-90-conflicts

Conversation

@hyperpolymath

Copy link
Copy Markdown
Owner

Supersedes #90 (chore/apply-foundation-ci-fixes-20260911), which is unmergeable as it stands.

What this is

One linear commit on top of current main containing exactly the net effect of
merging main into chore/apply-foundation-ci-fixes-20260911 with every conflict resolved.
Linear and single-commit because the branch rules require linear history and
allow squash merges only.

Original PR: #90

Conflicts and how each was resolved

Path Conflict Resolution
.github/workflows/codeql.yml content NEEDS_HUMAN
.github/workflows/governance.yml content NEEDS_HUMAN
.github/workflows/hypatia-scan.yml content NEEDS_HUMAN
.github/workflows/scorecard.yml content NEEDS_HUMAN
0-AI-MANIFEST.a2ml content NEEDS_HUMAN
EXPLAINME.adoc content NEEDS_HUMAN
README.adoc content NEEDS_HUMAN
TOPOLOGY.md modify/delete: deleted in main, modified in PR TAKE_PR

Why guix.scm is kept, not deleted

The 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. main has since replaced it
with a real package definition
(name, version, coreutils bash inputs;
grep -c '{{' now returns 0). Honouring the deletion would destroy a working
file, so main's version is kept.

Why the workflow pins stay at main's

The PR branch pins older hyperpolymath/standards revisions than main:

Pin Date Position
d7c22711 2026-06-26 PR side
81dbf2dd 2026-07-21 main side
d135b05b 2026-06-24 PR side
c65436ee 2026-07-20 main side

Taking the PR side would downgrade the reusable workflows by about a month.
Most of these files conflicted only because main added a trailing newline on
the same last line the PR re-pinned.

Verification

Asserted before push, then re-confirmed by an independent git ls-remote:

  • exactly 1 commit ahead of main, 0 behind
  • no conflict markers anywhere in the tree
  • git merge-tree against main exits 0 — genuinely conflict-free
  • no standards pin in the tree that is unreachable from standards/main
  • guix.scm present wherever main has it

Remote SHA: 71b6d33c854e

Net effect on main

.editorconfig                               | 39 +++--------------------------
 .gitattributes                              | 11 +++-----
 .gitignore                                  | 35 +++++++++++++-------------
 .machine_readable/descriptiles/AGENTIC.a2ml |  2 +-
 .nojekyll                                   |  0
 nqc/web/lib/bs/src/Msg.d                    |  0
 nqc/web/lib/bs/src/Route.d                  |  0
 7 files changed, 25 insertions(+), 62 deletions(-)

Replays the net effect of merging main into chore/apply-foundation-ci-fixes-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.
@coderabbitai

coderabbitai Bot commented Sep 18, 2026

Copy link
Copy Markdown

Review Change StackReview Change Stack

Note

Currently processing new changes in this PR. This may take a few minutes, please wait...

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Advanced

Run ID: 0bbf5c1c-454b-406d-8a6b-31249fcb6a42

📥 Commits

Reviewing files that changed from the base of the PR and between 8d07120 and 71b6d33.

📒 Files selected for processing (7)
  • .editorconfig
  • .gitattributes
  • .gitignore
  • .machine_readable/descriptiles/AGENTIC.a2ml
  • .nojekyll
  • nqc/web/lib/bs/src/Msg.d
  • nqc/web/lib/bs/src/Route.d
 ____________________________________________________________________________________________________________________________________________________________________________
< Good code is its own best documentation. As you're about to add a comment, ask yourself, 'How can I improve the code so that this comment isn't needed?' - Steve McConnell >
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  \
   \   (\__/)
       (•ㅅ•)
       /   づ

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@hyperpolymath
hyperpolymath merged commit 8407be9 into main Sep 18, 2026
24 of 28 checks passed
@hyperpolymath
hyperpolymath deleted the resolve/pr-90-conflicts branch September 18, 2026 14:07
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

Successfully merging this pull request may close these issues.

1 participant