Fix predictable wiki gitlink auto-resolution#323
Merged
Conversation
bf7102d to
be7bb2c
Compare
fd5c00d to
dce3da6
Compare
Contributor
|
🚀 Preview is available for this pull request. |
Contributor
Author
|
@codex review |
|
Codex Review: Didn't find any major issues. Swish! ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
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". |
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
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.
Related Issue
Closes #321
Motivation / Context
.github/wikigitlink conflicts becausegit add .github/wikirequires a materialized submodule checkout in the temporary clone.Changes
.github/wikipointer directly from the merge index.git addfor the submodule path.Verification
composer dev-toolscomposer dev-tools tests -- --filter='ResolvePredictableConflictsActionTest',composer dev-tools code-style,composer dev-tools changelog:check -- --file=CHANGELOG.md --against=origin/mainDocumentation / Generated Output
docs/updatedChangelog
CHANGELOG.mdentryReviewer Notes
--no-verifyafter the manual validations above passed.