Single commit for main2dev nightly#4614
Merged
Phlip79 merged 3 commits intoNVIDIA:mainfrom May 5, 2026
Merged
Conversation
Replace the bot's fix-as-new-commit pattern (PR NVIDIA#4436 was the exemplar — many small github-actions[bot] / svcnvidia-nemo-ci commits accumulated across the CI iteration loop) with an amend-and-force-push pattern, so each sync PR ends with exactly one bot-authored commit at HEAD. Three skill edits: - Phase 1 "Commit and Push" gains an explicit `git commit --amend --no-edit` step folding post-merge fixes into the merge commit itself; the merge structure (both parents) is preserved. - Phase 3 step 4's "fix, commit, push" becomes "fix, amend, `git push --force-with-lease`". Lease (not raw force) so a human commit landing on the branch out-of-band aborts the push instead of being clobbered. - Rules gains a canonical single-commit-policy bullet that the Phase 1 and Phase 3 sections point to instead of restating. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Member
Author
|
/ok to test bd7353d |
Member
Author
|
/claude review |
![claude[bot]](https://avatars.githubusercontent.com/in/1236702?s=60&v=4){kind=small}
The user clarified that the Phase 1 commit (the large merge) must never be modified once pushed; only Phase 3 fixes accumulate, and they squash into a single rolling fix commit on top. Final PR has 1 commit if CI passes, 2 commits otherwise — never more. - Rules: rename "single-commit policy" to "two-commit policy" and spell out the merge-immutable / fix-rolling split. - Phase 1 closing pointer: now says the commit is immutable for the rest of the run, fixes go to the rolling commit on top. - Phase 3 step 4: branch on `git rev-parse --verify HEAD^2` — succeeds (HEAD is the merge commit) ⇒ create the fix commit with a normal push; fails (HEAD is the existing fix commit) ⇒ amend with `--force-with-lease`. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Member
Author
|
/ok to test f6d1515 |
ko3n1g
approved these changes
May 5, 2026
|
🔄 Merge queue validation started! You can track the progress here: https://github.com/NVIDIA/Megatron-LM/actions/runs/25394814657 |
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Member
Author
|
/ok to test febbace |
|
🔄 Merge queue validation started! You can track the progress here: https://github.com/NVIDIA/Megatron-LM/actions/runs/25397118010 |
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
3 participants
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.
The nightly main2dev automation should continually push to the same commit, instead of having multiple small commits.