fix: align remaining dev/main conflict files for #427 (v4)#431
Merged
Conversation
mpaulosky
enabled auto-merge (squash)
July 4, 2026 15:17
github-actions
Bot
added
the
squad
Contributor
🏗️ PR Added to Squad Triage QueueThis PR has been labeled with Next steps:
|
There was a problem hiding this comment.
Pull request overview
Linear conflict-neutralization pass that aligns a small set of files between dev and main, focusing on Node/Web lockfiles and the “squad-standard” YAML/Markdown lint workflows to reduce recurring merge conflicts.
Changes:
- Downgraded
markdownlint-cli2insrc/Web/package.jsonand synchronizedsrc/Web/package-lock.jsonaccordingly (including resolving embedded conflict-marker artifacts). - Updated
src/Web/package-lock.jsondependency resolutions (notably Tailwind-related packages) to match the aligned baseline. - Simplified “squad-standard” lint workflows to lint tracked files via
git ls-filesrather than diff-based file selection.
Reviewed changes
Copilot reviewed 3 out of 4 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| src/Web/package.json | Aligns the markdown lint tooling version with the conflict-neutralized baseline. |
| src/Web/package-lock.json | Resolves conflict artifacts and aligns the dependency tree/lock state with the updated Web devDependencies. |
| .github/workflows/squad-standard-lint-yaml.yml | Simplifies YAML lint execution and checkout behavior for conflict-neutral alignment. |
| .github/workflows/squad-standard-lint-markdown.yml | Simplifies Markdown lint execution and checkout behavior for conflict-neutral alignment. |
Files not reviewed (1)
- src/Web/package-lock.json: Generated file
| - uses: actions/checkout@v7 | ||
| with: | ||
| fetch-depth: 0 | ||
| - uses: actions/checkout@v6 |
| else | ||
| files=$(git ls-files '*.yml' '*.yaml') | ||
| fi | ||
| files=$(git ls-files '*.yml' '*.yaml') |
| with: | ||
| fetch-depth: 0 | ||
| - uses: actions/setup-node@v6 | ||
| - uses: actions/checkout@v6 |
| else | ||
| files=$(git ls-files '*.md') | ||
| fi | ||
| files=$(git ls-files '*.md') |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## dev #431 +/- ##
=======================================
Coverage 76.73% 76.73%
=======================================
Files 71 71
Lines 1775 1775
Branches 214 214
=======================================
Hits 1362 1362
Misses 336 336
Partials 77 77 🚀 New features to boost your workflow:
|
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.
Linear conflict-neutralization pass for #427 under squash-only policy.
Refs #427