Repository navigation
MEMORY.md への追記を memory/ の1作業1ファイルへ移し、コンフリクトを避ける - #157
Merged
Merged
Conversation
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01WjEknS51JooBiAbRurF2tK
2 tasks done
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Requested by src3453 · project thread
Closes #156
概要
各スレッドが
MEMORY.mdの末尾付近へ追記するため、並行する PR が同じ位置を編集してコンフリクトしていました(#145、#155)。memory/YYYY-MM-DD-issue-NNN-slug.mdとして新規ファイルで書く。共有ファイルを編集しないので衝突しない。MEMORY.md(約1500行、132節)は過去分のアーカイブとして凍結し、新規追記しない。ls memory/とgrepで探す。memory/README.mdに書式と規則を追加し、AGENTS.mdとCLAUDE.mdの記述を合わせた。案の比較
.gitattributesのmerge=union: 衝突は消えるが、節が交互に混ざる・重複行が残るなど記録が壊れうる。また、ここで解決するのは git の textual merge だけ。検証
ドキュメントのみの変更で、コードのテストは実行していません。
Generated by Claude Code