Skip to content

chore: remove stale .squad/decisions/decisions.md gitattributes rule (#2378) - #2380

Merged
tamirdresher merged 2 commits into
devfrom
squad2-gitattributes-stale-decisions-rule
Nov 1, 2026
Merged

tamirdresher merged 2 commits into
devfrom
squad2-gitattributes-stale-decisions-rule

Conversation

@tamirdresher

Copy link
Copy Markdown
Collaborator

The root .gitattributes carries a stale duplicate rule:

.squad/decisions/decisions.md merge=union

The correct rule, .squad/decisions.md merge=union, sits at the top of the same file and has been there since commit 115fc04. The decisions/decisions.md path is not a real Squad state file (the decisions log lives at .squad/decisions.md), so the stale line matches nothing and only misleads readers. It was the source of confusion reported in #2378.

This PR removes only that one line. The correct .squad/decisions.md merge=union rule is unchanged.

Verification:

  • git diff shows exactly one deleted line in .gitattributes, no additions.
  • git grep "decisions/decisions.md" finds no other references in the repo, including test/, scripts/, docs, and templates.
  • .gitattributes is not listed in any package files array, so no changeset is needed.

Refs #2378

…2378)

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 995eea17-c356-4912-90ea-5e5b144e7ba9
Copilot AI balanced review requested due to automatic review settings November 1, 2026 10:53
@github-actions

github-actions Bot commented Nov 1, 2026 •

Copy link
Copy Markdown
Contributor

🛫 PR Readiness Check

ℹ️ This comment updates on each push. Last checked: commit 4347b54

PR Scope: 🔧 Infrastructure

⚠️ 3 item(s) to address before review

Status Check Details
❌ Single commit 2 commits — consider squashing before review
✅ Not in draft Ready for review
✅ Branch up to date Up to date with dev
❌ Copilot review No Copilot review yet — it may still be processing
✅ Changeset present No source files changed — changeset not required
✅ Scope clean No .squad/ or docs/proposals/ files
✅ No merge conflicts No merge conflicts
✅ Copilot threads resolved No Copilot review threads
❌ CI passing 1 check(s) still running

Files Changed (1 file, +0 −1)

File +/−
.gitattributes +0 −1

Total: +0 −1


This check runs automatically on every push. Fix any ❌ items and push again.
See CONTRIBUTING.md and PR Requirements for details.

@github-actions

github-actions Bot commented Nov 1, 2026

Copy link
Copy Markdown
Contributor

🟢 Impact Analysis — PR #2380

Risk tier: 🟢 LOW

📊 Summary

Metric Count
Files changed 1
Files added 0
Files modified 1
Files deleted 0
Modules touched 1

🎯 Risk Factors

  • 1 files changed (≤5 → LOW)
  • 1 module(s) touched (≤1 → LOW)

📦 Modules Affected

root (1 file)
  • .gitattributes

This report is generated automatically for every PR. See #733 for details.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🟢 Approval recommended

No active review issues are reported for the removal of the obsolete decision-log merge rule.

No open issues 🎉

What changed in this PR

Removes an obsolete Git attributes rule to clarify which Squad decision log receives union-merge handling. This is configuration cleanup, not a fix for the state-MCP behavior reported in #2378.

Changes:

  • Removes .squad/decisions/decisions.md merge=union.
  • Preserves the correct .squad/decisions.md merge=union rule.
File Description
.gitattributes Removes the stale decision-log path rule.

Review effort: Balanced

@tamirdresher
tamirdresher merged commit 12fbcb5 into dev Nov 1, 2026
23 checks passed
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.

2 participants