Repository navigation
chore: remove stale .squad/decisions/decisions.md gitattributes rule (#2378) - #2380
Merged
Merged
Conversation
…2378) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 995eea17-c356-4912-90ea-5e5b144e7ba9
Contributor
🛫 PR Readiness Check
PR Scope: 🔧 Infrastructure
|
| 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.
Contributor
🟢 Impact Analysis — PR #2380Risk tier: 🟢 LOW 📊 Summary
🎯 Risk Factors
📦 Modules Affectedroot (1 file)
This report is generated automatically for every PR. See #733 for details. |
Contributor
There was a problem hiding this comment.
🟢 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=unionrule.
| File | Description |
|---|---|
.gitattributes |
Removes the stale decision-log path rule. |
Review effort: Balanced
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.
The root
.gitattributescarries a stale duplicate rule:The correct rule,
.squad/decisions.md merge=union, sits at the top of the same file and has been there since commit 115fc04. Thedecisions/decisions.mdpath 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=unionrule is unchanged.Verification:
git diffshows exactly one deleted line in.gitattributes, no additions.git grep "decisions/decisions.md"finds no other references in the repo, includingtest/,scripts/, docs, and templates..gitattributesis not listed in any packagefilesarray, so no changeset is needed.Refs #2378