Skip to content

fix: align remaining #427 conflict files to main (v6)#433

Merged
mpaulosky merged 1 commit into
devfrom
squad/427-dev-conflict-fix-v6
Jul 4, 2026
Merged

fix: align remaining #427 conflict files to main (v6)#433
mpaulosky merged 1 commit into
devfrom
squad/427-dev-conflict-fix-v6

Conversation

@mpaulosky

Copy link
Copy Markdown
Owner

Final conflict-alignment pass for #427.

  • aligns .github/workflows/squad-standard-lint-yaml.yml to main
  • aligns tests/AppHost.Tests/Infrastructure/AspireManager.cs to main, then applies required formatter output
  • full local pre-push gates passed

Refs #427

Copilot AI review requested due to automatic review settings July 4, 2026 15:35
@mpaulosky
mpaulosky enabled auto-merge (squash) July 4, 2026 15:35
@github-actions github-actions Bot added the squad Squad triage inbox — Lead will assign to a member label Jul 4, 2026
@github-actions

github-actions Bot commented Jul 4, 2026

Copy link
Copy Markdown
Contributor

🏗️ PR Added to Squad Triage Queue

This PR has been labeled with squad and added to the triage queue.

Next steps:

  • The squad Lead will review and assign to an appropriate team member
  • A squad:member label will be added after triage

If you know which squad member should handle this, you can add the appropriate squad:member label yourself.

@mpaulosky
mpaulosky merged commit cd1da91 into dev Jul 4, 2026
10 of 12 checks passed
@mpaulosky
mpaulosky deleted the squad/427-dev-conflict-fix-v6 branch July 4, 2026 15:35

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Final conflict-alignment cleanup for PR #427 by removing an outdated helper comment from the YAML lint workflow, bringing the workflow file back in sync with main.

Changes:

  • Removed a temporary conflict-fix helper comment from the YAML lint workflow header.

@codecov

codecov Bot commented Jul 4, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 76.73%. Comparing base (2161687) to head (04c84ff).
⚠️ Report is 1 commits behind head on dev.

Additional details and impacted files
@@           Coverage Diff           @@
##              dev     #433   +/-   ##
=======================================
  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:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

squad Squad triage inbox — Lead will assign to a member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants