Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
# Agentic workflow lock files are generated artifacts; keep ours and recompile on conflicts.
.github/workflows/*.lock.yml linguist-generated=true merge=ours
Comment on lines +23 to +24
Copy link

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

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

Setting merge=ours for generated *.lock.yml files can silently keep an outdated lock file when the corresponding .md prompt file changes in another branch, leading to a merged state where the lock file no longer matches the source (and the workflow’s stale-lock-file check may fail at runtime). Safer options are to (1) avoid merge=ours and resolve conflicts by regenerating the lock file, or (2) enforce regeneration in CI so mismatches can’t land.

Suggested change
# Agentic workflow lock files are generated artifacts; keep ours and recompile on conflicts.
.github/workflows/*.lock.yml linguist-generated=true merge=ours
# Agentic workflow lock files are generated artifacts; resolve conflicts by regenerating them.
.github/workflows/*.lock.yml linguist-generated=true

Copilot uses AI. Check for mistakes.
Loading
Loading