Skip to content

fix: sync .gitattributes to prevent pr_body.md merge conflicts #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stranske merged 1 commit into from
Jan 3, 2026
Merged

fix: sync .gitattributes to prevent pr_body.md merge conflicts #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions .github/sync-manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,12 @@ docs:
target: CLAUDE.md
description: "Context file for Claude/AI assistants"

# Git configuration files for merge strategies
git_config:
- source: .gitattributes
description: "Git attributes - merge strategies to prevent pr_body.md conflicts"


# Files that exist in templates but are NOT synced (consumer creates their own)
excluded:

Expand Down
10 changes: 10 additions & 0 deletions templates/consumer-repo/.gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Git attributes for consumer repos synced from Workflows
#
# Merge strategies to prevent recurring conflicts on PR-specific files:
# pr_body.md contains issue-specific content that differs between branches.
# Using merge=ours keeps each branch's version during merges.

pr_body.md merge=ours

# CI autofix history is append-only and branch-specific
ci/autofix/history.json merge=ours linguist-generated
Loading