## ADDED Requirements ### Requirement: Repository text normalization baseline The repository MUST define a `.gitattributes` baseline that normalizes text handling rules across developer environments. #### Scenario: Text file is committed from different operating systems - **WHEN** contributors commit text files from mixed platforms - **THEN** line-ending behavior MUST follow repository-defined normalization rules to avoid platform-only diffs #### Scenario: New text-like file type is introduced - **WHEN** a file type with line-based content is added to the project - **THEN** the baseline policy MUST define whether it is treated as text and how normalization applies ### Requirement: Binary and generated artifact merge safety The repository baseline MUST identify binary or generated artifacts that should not use normal text merge semantics. #### Scenario: Binary asset is modified in parallel branches - **WHEN** a merge involves binary files with conflicting revisions - **THEN** the repository rules MUST avoid unsafe text merge behavior and require explicit conflict resolution #### Scenario: Generated output appears in a pull request - **WHEN** generated artifacts are changed - **THEN** repository ignore and tracking rules MUST determine whether those files are versioned or excluded ### Requirement: Conflict resolution operational guidance The project MUST provide a documented conflict-resolution procedure that developers can follow consistently. #### Scenario: Developer encounters merge conflict - **WHEN** a sync or integration action results in conflict markers - **THEN** the developer MUST follow the documented resolution steps and verification checklist before completing the merge #### Scenario: Team identifies recurring conflict hotspot - **WHEN** the same files repeatedly conflict across iterations - **THEN** the process MUST require adding mitigation actions (ownership, file split, or baseline rule update) to reduce recurrence