Skip to content

git: 改行衝突を減らす .gitattributes を追加#50

Merged
bubio merged 1 commit intodevfrom
codex/repo-gitattributes
Feb 13, 2026
Merged

git: 改行衝突を減らす .gitattributes を追加#50
bubio merged 1 commit intodevfrom
codex/repo-gitattributes

Conversation

@bubio
Copy link
Owner

@bubio bubio commented Feb 13, 2026

概要
改行由来の不要コンフリクトを減らすため、リポジトリに .gitattributes を追加します。

変更内容

    • text=auto を設定
  • バイナリ拡張子を binary として明示(画像/音声/圧縮/ROM/D88 など)

意図

  • 既存ファイルの大規模改行変換を避けつつ、今後の改行起因コンフリクトを減らすための最小構成です。

@bubio bubio merged commit 95e424a into dev Feb 13, 2026
2 of 7 checks passed
@bubio bubio deleted the codex/repo-gitattributes branch February 13, 2026 10:12
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.

1 participant