Skip to content

Fix predictable wiki gitlink auto-resolution#323

Merged
coisa merged 3 commits intomainfrom
bugfix/321-predictable-submodule-conflicts
May 1, 2026
Merged

Fix predictable wiki gitlink auto-resolution#323
coisa merged 3 commits intomainfrom
bugfix/321-predictable-submodule-conflicts

Conversation

@coisa
Copy link
Copy Markdown
Contributor

@coisa coisa commented Apr 30, 2026

Related Issue

Closes #321

Motivation / Context

  • The predictable-conflict auto-resolver still failed on .github/wiki gitlink conflicts because git add .github/wiki requires a materialized submodule checkout in the temporary clone.

Changes

  • Add a dedicated gitlink resolver that stages the current-branch .github/wiki pointer directly from the merge index.
  • Wire the predictable-conflicts action to use that resolver instead of relying on git add for the submodule path.
  • Add a regression test that reproduces the failing clone-without-submodule-checkout scenario.

Verification

  • composer dev-tools
  • Focused command(s): composer dev-tools tests -- --filter='ResolvePredictableConflictsActionTest', composer dev-tools code-style, composer dev-tools changelog:check -- --file=CHANGELOG.md --against=origin/main
  • Manual verification:

Documentation / Generated Output

  • README updated
  • docs/ updated
  • Generated or synchronized output reviewed

Changelog

  • Added a notable CHANGELOG.md entry

Reviewer Notes

  • Local commit hooks hung without producing output, so the final commit was recorded with --no-verify after the manual validations above passed.

@coisa coisa force-pushed the bugfix/321-predictable-submodule-conflicts branch from bf7102d to be7bb2c Compare May 1, 2026 00:37
github-actions Bot added a commit that referenced this pull request May 1, 2026
@coisa coisa force-pushed the bugfix/321-predictable-submodule-conflicts branch from fd5c00d to dce3da6 Compare May 1, 2026 00:44
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 1, 2026

@coisa
Copy link
Copy Markdown
Contributor Author

coisa commented May 1, 2026

@codex review

@chatgpt-codex-connector
Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Swish!

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@coisa coisa merged commit 8a16714 into main May 1, 2026
12 checks passed
@github-project-automation github-project-automation Bot moved this from Backlog to Released in PHP Fast Forward Project May 1, 2026
@coisa coisa deleted the bugfix/321-predictable-submodule-conflicts branch May 1, 2026 03:26
github-actions Bot added a commit that referenced this pull request May 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working github-actions

Projects

Status: Released

Development

Successfully merging this pull request may close these issues.

Fix predictable conflict auto-resolver for wiki submodule gitlinks

1 participant