Repository navigation
fix: restore deploy-parakh.yml rename lost in the dev->main merge - #461
Merged
Merged
Conversation
PR #460 (dev -> main) reported zero conflicts and merged clean, but the actual result was wrong: main kept the stale, pre-rename deploy-parakh-dev.yml (old dev-only content, no prod logic) instead of adopting deploy-parakh.yml. Root cause: PR #459 renamed the file AND changed most of its content in the same commit. Git's rename detection (~50% similarity threshold) didn't recognize the two as the same file, so the 3-way merge treated it as an unrelated delete (of the old path, unchanged on main / gone on dev) + add (of the new path, dev-only) -- and for reasons not fully traced, the add didn't land, leaving only the stale file behind. Confirmed main had zero trace of deploy-parakh.yml anywhere in its tree. Fix: explicit rm + checkout from dev's real, already-proven content -- verified byte-identical to what's currently running successfully on dev.
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
1 participant
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.
Why
PR #460 (`dev` → `main`) reported zero conflicts and merged clean, but the actual result was wrong: `main` kept the stale, pre-rename `deploy-parakh-dev.yml` (old dev-only content, no prod logic) instead of adopting `deploy-parakh.yml`.
Root cause: PR #459 renamed the file and changed most of its content in the same commit. Git's rename detection (~50% similarity threshold) didn't recognize the two as the same file, so the 3-way merge treated it as an unrelated delete (of the old path) + add (of the new path) — and the add didn't land, leaving only the stale file behind. Confirmed `main` had zero trace of `deploy-parakh.yml` anywhere in its tree despite the "clean" merge.
Fix
Explicit `rm` + `checkout` from `dev`'s real content — verified byte-identical to what's currently running successfully on `dev`.
Test plan