mirror of
https://github.com/Matysh/houseplan-card
synced 2026-09-29 03:09:36 +00:00
Claudeandclaude[bot]
5986332eda
14 of 48 returns in #600–#691 were rebase or merge conflicts on shared files where the two edits do not contradict each other. - .gitattributes: docs/CHANGELOG.md and docs/CHANGELOG.ru.md use the built-in merge=union driver — both tasks' lines in ## Unreleased survive a rebase, a merge and git merge-tree (#696's clean-merge test) without a stop. - rebase-generated.mjs: UPSTREAM_WINS — on a conflict in scripts/monolith-baseline.json the rebase takes dev's side; the band test on the candidate's Validate judges the merged tree (#699). Any other conflicting path aborts exactly as before, with the full list. - merge-candidate.mjs: the candidate's patch-id excludes the changelogs and the monolith baseline next to docs/reviews, so a neighbour's line next to the task entry does not re-send a green task to review. - screenshots.json needs nothing: after #697 task branches do not commit it. Canon: PROCESS.md, the rebase paragraph of the review index (#643). Issue: #698 User-Visible: no Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_018qZfe7YS4rqEMKoVeS3GKd
21 lines
640 B
Plaintext
21 lines
640 B
Plaintext
* text=auto eol=lf
|
|
|
|
*.png binary
|
|
*.jpg binary
|
|
*.jpeg binary
|
|
*.gif binary
|
|
*.webp binary
|
|
*.ico binary
|
|
*.pdf binary
|
|
*.mp4 binary
|
|
*.webm binary
|
|
*.zip binary
|
|
*.woff binary
|
|
*.woff2 binary
|
|
|
|
# #698: записи двух задач в `## Unreleased` друг другу не противоречат — при
|
|
# слиянии и ребейзе git объединяет обе стороны сам (встроенный драйвер union),
|
|
# и параллельные задачи не возвращаются в S6 из-за соседней строки ченджлога.
|
|
docs/CHANGELOG.md merge=union
|
|
docs/CHANGELOG.ru.md merge=union
|