Repository navigation
Use removes a hand-made file added since, leaves an object folded inside since as it is, and puts a file where a folder stands; the conversion's merge always writes drama-cli's bytes - #264
Merged
Conversation
…ide since as it is, and puts a file where a folder stands; the conversion's merge always writes drama-cli's bytes Codex's read-only review of #263 (d57ede8): - A person's change records the changes found on disk before it reads what to write, not after, so it reads a HEAD that holds the folder: Use's list of the folder now includes a file added by hand and not committed, which it removes when the result did not have it (history keeps it). - Use's nested objects are those of the result and of now together (filesOfObjectAt takes both revisions), so a folder that became an object of its own since is left as it is. - A person's change deletes first, each deletion with the folders it leaves empty (removeEmptiedFolders, as git's dir.c remove_path), and a path where a folder stands is never "already on disk", so a file can take a folder's place. - The conversion's merge gives drama-cli's bytes (stripped, one trailing newline) also when it adds nothing. - The smoke test's episode click case no longer fakes an editable record on a take; quick-start and the seg editor no longer say the canvas edits episode prompts. Signed-off-by: SitgesRun <169425442+SitgesRun@users.noreply.github.com>
This was referenced Nov 16, 2026
Merged
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.
These are the fixes for Codex's read-only review of #263 (d57ede8), one commit on staging d57ede8.
applyPersonChangerecords the changes found on disk before it reads what to write, so every person change reads a HEAD that holds the folder (history keeps the hand-made file)filesOfObjectAttakes both revisions, and a nested object at either is left out of bothEISDIRremoveEmptiedFolders, as git's dir.c remove_path), and a path where a folder stands is never "already on disk"Size: production 5 files, +29/−20; tests 3 files, +34/−5; docs +1/−1.
Gates