compile: stop adding ineffective merge=ours to lock.yml .gitattributes entry by Copilot · Pull Request #50639 · github/gh-aw

Copilot · 2026-08-05T17:18:57Z

gh aw compile appended merge=ours to the lock-file .gitattributes entry. merge=ours is not a built-in git merge driver — without merge.ours.driver configured it is inert, falsely implying generated-file conflicts are auto-resolved. The old code also rewrote any pre-existing line starting with the lock-yml glob, clobbering repository-owned policy on every compile.

Changes

pkg/constants/constants.go: WorkflowsLockYmlGitAttributesEntry drops merge=ours → .github/workflows/*.lock.yml linguist-generated=true. Added WorkflowsLockYmlGitAttributesEntryLegacy for the old value, used only to detect entries gh-aw previously wrote.
pkg/cli/git.go (ensureGitAttributes): replaced the strings.HasPrefix(glob) match with an exact match against the legacy entry. Only gh-aw's own prior entry is migrated; other repo-owned lock-yml lines are left untouched.
Tests / docs: updated expectations, added cases for legacy-entry migration and repo-owned-policy preservation; updated create.md and pkg/constants/README.md.

Behavior

Existing line	Result
absent	adds `... linguist-generated=true`
`... linguist-generated=true merge=ours` (legacy gh-aw)	migrated, `merge=ours` removed
`... linguist-generated=true merge=union` (repo-owned)	untouched

The repository's own legacy entry will be migrated on the next compile run.

Fixes compile: re-adds ineffective merge=ours to .gitattributes, overwriting repo-owned policy #50583

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>

github-actions · 2026-08-05T17:39:56Z

🧠 Matt Pocock Skills Reviewer has completed the skills-based review. ✅

github-actions · 2026-08-05T17:40:10Z

✅ Design Decision Gate 🏗️ completed the design decision gate check.

No ADR enforcement needed: PR does not have the implementation label and has ≤100 new lines of code in business logic directories (38 additions detected).

github-actions · 2026-08-05T17:40:12Z

✅ Test Quality Sentinel completed test quality analysis.

github-actions · 2026-08-05T17:40:40Z

⚠️ PR Code Quality Reviewer failed during code quality review.

Copilot

Pull request overview

Removes ineffective merge=ours handling while preserving repository-owned .gitattributes policies.

Changes:

Adds exact legacy-entry migration.
Updates tests and documentation.
Updates the repository’s own lock-file attribute.

Show a summary per file

File	Description
`.gitattributes`	Removes `merge=ours`.
`create.md`	Updates authoring guidance.
`pkg/cli/add_gitattributes_test.go`	Updates add-command expectations.
`pkg/cli/git.go`	Restricts migration to the exact legacy entry.
`pkg/cli/gitattributes_test.go`	Tests migration and policy preservation.
`pkg/cli/init_command_test.go`	Updates initialization expectations.
`pkg/cli/init_integration_test.go`	Updates integration expectations.
`pkg/cli/init_test.go`	Updates initialization tests.
`pkg/constants/README.md`	Updates the generated constants appendix, but incompletely.
`pkg/constants/constants.go`	Defines current and legacy entries.

Review details

Tip

Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Files reviewed: 10/10 changed files
Comments generated: 1
Review effort level: Balanced

 | `constants.go` | `const` | `WorkflowsDir` | `const WorkflowsDir = ".github/workflows"` | WorkflowsDir is the GitHub Actions workflow directory path (without trailing slash). |
 | `constants.go` | `const` | `WorkflowsDirSlash` | `const WorkflowsDirSlash = WorkflowsDir + "/"` | WorkflowsDirSlash is WorkflowsDir with a trailing slash. |
-| `constants.go` | `const` | `WorkflowsLockYmlGitAttributesEntry` | `const WorkflowsLockYmlGitAttributesEntry = WorkflowsLockYmlGlob + " linguist-generated=true merge=ours"` | WorkflowsLockYmlGitAttributesEntry is the . |
+| `constants.go` | `const` | `WorkflowsLockYmlGitAttributesEntry` | `const WorkflowsLockYmlGitAttributesEntry = WorkflowsLockYmlGlob + " linguist-generated=true"` | WorkflowsLockYmlGitAttributesEntry is the . |


github-actions

The change is correct and well-implemented.

merge=ours without a configured merge.ours.driver is a no-op, so removing it fixes a misleading gitattributes entry.
The migration uses an exact-match against the legacy constant rather than HasPrefix, which correctly prevents clobbering repository-owned policy (e.g. merge=union).
The duplicate-entry case for repo-owned lines is intentional and tested: git unions attributes from both matching lines.
Tests cover all four scenarios (absent, legacy, current, repo-owned), and docs are updated consistently.> 🧵 Reviewed using Impeccable skills by Impeccable Skills Reviewer · sonnet46 · 16 AIC · ⌖ 10.2 AIC · ⊞ 5.4K

github-actions

Skills-Based Review 🧠

Applied /diagnosing-bugs and /codebase-design — approving with one minor documentation note.

📋 Key Themes & Highlights

Key Themes

Root cause properly addressed: the merge=ours attribute was silently inert without a configured merge driver; removing it eliminates the false assurance.
Surgical migration logic: switching from strings.HasPrefix to exact match on the legacy constant ensures only gh-aw's own prior entry is touched — repository-owned policy lines are preserved.
Good test coverage: new cases for legacy-entry migration and repo-owned-policy preservation directly capture the previously missing scenarios.

Minor Finding

WorkflowsLockYmlGitAttributesEntryLegacy is not yet reflected in pkg/constants/README.md — see inline comment.

Positive Highlights

✅ Clear naming: legacy constant name makes the intent unmistakable.
✅ Behaviour table in the PR description precisely documents all three cases.
✅ All existing tests updated consistently.

> 🧠 *Reviewed using Matt Pocock's skills by [Matt Pocock Skills Reviewer](https://github.com/github/gh-aw/actions/runs/31030978513)* · sonnet46 · 19.2 AIC · ⌖ 9.78 AIC · ⊞ 7.1K > _{Comment /matt to run again}

github-actions · 2026-08-05T17:44:52Z

 | `constants.go` | `const` | `WorkflowsDir` | `const WorkflowsDir = ".github/workflows"` | WorkflowsDir is the GitHub Actions workflow directory path (without trailing slash). |
 | `constants.go` | `const` | `WorkflowsDirSlash` | `const WorkflowsDirSlash = WorkflowsDir + "/"` | WorkflowsDirSlash is WorkflowsDir with a trailing slash. |
-| `constants.go` | `const` | `WorkflowsLockYmlGitAttributesEntry` | `const WorkflowsLockYmlGitAttributesEntry = WorkflowsLockYmlGlob + " linguist-generated=true merge=ours"` | WorkflowsLockYmlGitAttributesEntry is the . |
+| `constants.go` | `const` | `WorkflowsLockYmlGitAttributesEntry` | `const WorkflowsLockYmlGitAttributesEntry = WorkflowsLockYmlGlob + " linguist-generated=true"` | WorkflowsLockYmlGitAttributesEntry is the . |


[/codebase-design] The new WorkflowsLockYmlGitAttributesEntryLegacy constant is missing from the README appendix — only WorkflowsLockYmlGitAttributesEntry appears on this line.

If this README is auto-generated (e.g. via make), re-run the generator to include the new constant. If it is manually maintained, add the missing row so the constant is discoverable.

@copilot please address this.

github-actions · 2026-08-05T17:45:28Z

🧪 Test Quality Sentinel Report

✅ Test Quality Score: N/A — No New Tests

Analyzed 0 new or modified test functions. The 5 changed test files contain only string-constant updates (expected .gitattributes value changes) — no new behavioral test functions were added or modified.

📊 Metrics

Metric	Value
Changed test files	5
New `func Test*` added	0
Modified test functions	0
🚨 Violations	0

Changed test files:

pkg/cli/add_gitattributes_test.go (+2/-2)
pkg/cli/gitattributes_test.go (+17/-11)
pkg/cli/init_command_test.go (+3/-3)
pkg/cli/init_integration_test.go (+1/-1)
pkg/cli/init_test.go (+2/-2)

All changes are string-literal updates reflecting the new .gitattributes constant (removing merge=ours).

Verdict

✅ passed. No new behavioral tests to evaluate; existing tests updated to match changed constant.

🧪 Test quality analysis by Test Quality Sentinel · sonnet46 · 28.6 AIC · ⌖ 8.98 AIC · ⊞ 7.7K · ◷
_{Comment /review to run again}

github-actions

✅ Test Quality Sentinel: N/A — No New Tests. 0 violations. Existing tests updated to reflect constant changes only.

github-actions · 2026-08-05T18:50:24Z

PR Triage: #50639

Category: refactor | Risk: low | Priority Score: 50/100 (impact 20, urgency 15, quality 15)
Recommended action: batch_review
Grouped with compile/trial cluster (50640, 50638).

Generated by 🔧 PR Triage Agent · auto · 45.2 AIC · ⌖ 2.9 AIC · ⊞ 8K · ◷

gh-aw-bot · 2026-08-05T19:08:08Z

@copilot please follow up on the latest review feedback on this PR:

unresolved review threads (newest first):
- github-actions[bot]: compile: stop adding ineffective merge=ours to lock.yml .gitattributes entry #50639 (comment)
- Copilot: compile: stop adding ineffective merge=ours to lock.yml .gitattributes entry #50639 (comment)
failed checks:
- agent: https://github.com/github/gh-aw/actions/runs/31030978505/job/92391885747
if the branch is behind main, refresh it.
then run the skill and push the fixes.

Generated by 👨‍🍳 PR Sous Chef · gpt54 · 10.8 AIC · ⌖ 5.72 AIC · ⊞ 8.3K · ◷
_{Comment /souschef to run again}

…ME appendix, update counts Co-authored-by: gh-aw-bot <259018956+gh-aw-bot@users.noreply.github.com>

Copilot · 2026-08-05T19:15:10Z

@copilot please follow up on the latest review feedback on this PR:

unresolved review threads (newest first):

github-actions[bot]: compile: stop adding ineffective merge=ours to lock.yml .gitattributes entry #50639 (comment)...

Fixed in the latest commit: added the missing WorkflowsLockYmlGitAttributesEntryLegacy row to the appendix table, corrected the Constants count (305→306), and updated the Additional symbols count (99→100). Also fixed the truncated description for WorkflowsLockYmlGitAttributesEntry while I was there.

gh-aw-bot · 2026-08-05T20:29:30Z

@copilot please follow up on the latest review feedback on this PR:

unresolved review threads (newest first):
- github-actions[bot]: compile: stop adding ineffective merge=ours to lock.yml .gitattributes entry #50639 (comment)
- Copilot: compile: stop adding ineffective merge=ours to lock.yml .gitattributes entry #50639 (comment)
if the branch is behind main, refresh it.
then run the pr-finisher skill and push the fixes.

Generated by 👨🍳 PR Sous Chef · run: https://github.com/github/gh-aw/actions/runs/31043697225

Generated by 👨‍🍳 PR Sous Chef · gpt54 · 12.2 AIC · ⌖ 6.03 AIC · ⊞ 8.3K · ◷
_{Comment /souschef to run again}

Initial plan

38ca699

Copilot AI assigned Copilot and pelikhan Aug 5, 2026

Copilot started work on behalf of pelikhan August 5, 2026 17:19 View session

Copilot AI linked an issue Aug 5, 2026 that may be closed by this pull request

compile: re-adds ineffective merge=ours to .gitattributes, overwriting repo-owned policy #50583

Closed

Stop adding ineffective merge=ours to lock.yml .gitattributes entry

c7c89e7

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Fix ineffective merge=ours in .gitattributes handling~~ compile: stop adding ineffective merge=ours to lock.yml .gitattributes entry Aug 5, 2026

pelikhan marked this pull request as ready for review August 5, 2026 17:38

Copilot AI balanced review requested due to automatic review settings August 5, 2026 17:38

Copilot started reviewing on behalf of pelikhan August 5, 2026 17:39 View session

Copilot AI reviewed Aug 5, 2026

View reviewed changes

Copilot finished work on behalf of pelikhan August 5, 2026 17:43

Copilot AI requested a review from pelikhan August 5, 2026 17:43

github-actions Bot approved these changes Aug 5, 2026

View reviewed changes

github-actions Bot mentioned this pull request Aug 5, 2026

[aw] PR Code Quality Reviewer failed #50657

Open

github-actions Bot added pr-action:batch_review pr-agent:copilot pr-priority:medium pr-risk:low pr-type:refactor pr-batch:compile-trial labels Aug 5, 2026

github-actions Bot mentioned this pull request Aug 5, 2026

[PR Triage Report] PR Triage Report — 2026-08-05 (Run 31035927767) #50668

Open

github-actions Bot mentioned this pull request Aug 5, 2026

[pr-sous-chef] pr-sous-chef run report #50440

Open

Copilot started work on behalf of gh-aw-bot August 5, 2026 19:08 View session

docs(constants): add WorkflowsLockYmlGitAttributesEntryLegacy to READ…

dd98794

…ME appendix, update counts Co-authored-by: gh-aw-bot <259018956+gh-aw-bot@users.noreply.github.com>

Copilot finished work on behalf of gh-aw-bot August 5, 2026 19:33

Copilot AI requested a review from gh-aw-bot August 5, 2026 19:33

Copilot started work on behalf of gh-aw-bot August 5, 2026 20:30 View session

pelikhan merged commit 86aa220 into main Aug 5, 2026
26 of 28 checks passed

pelikhan deleted the copilot/re-add-merge-ours-to-gitattributes branch August 5, 2026 21:47

Uh oh!

Conversation

Copilot AI commented Aug 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Behavior

Uh oh!

github-actions Bot commented Aug 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Aug 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Aug 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Aug 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Review details

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Skills-Based Review 🧠

Key Themes

Minor Finding

Positive Highlights

Uh oh!

github-actions Bot Aug 5, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Aug 5, 2026

🧪 Test Quality Sentinel Report

Verdict

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Aug 5, 2026

PR Triage: #50639

Uh oh!

gh-aw-bot commented Aug 5, 2026

Uh oh!

Copilot AI commented Aug 5, 2026

Uh oh!

gh-aw-bot commented Aug 5, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Copilot AI commented Aug 5, 2026 •

edited

Loading

github-actions Bot commented Aug 5, 2026 •

edited

Loading

github-actions Bot commented Aug 5, 2026 •

edited

Loading

github-actions Bot commented Aug 5, 2026 •

edited

Loading

github-actions Bot commented Aug 5, 2026 •

edited

Loading