docker: point MEGATRON_BRANCH back at miles-main - #2734
Merged
Merged
Conversation
The bump landed on miles-main-20260819 while miles-main still held the pre-bump tree. That branch is now miles-main (the old tree is kept as miles-backup-20260819), so the temporary name no longer resolves -- and every other consumer (CI defaults, Dockerfile.rocm, the release lock) already reads miles-main.
![claude[bot]](https://avatars.githubusercontent.com/in/1236702?s=60&v=4){kind=small}
There was a problem hiding this comment.
Claude Code Review
This repository is configured for manual code reviews. Comment @claude review for a one-time review, or @claude review always to subscribe this PR to a review on every future push.
Tip: disable this comment in your organization's Code Review settings.
Zhichenzzz
approved these changes
Aug 24, 2026
yueming-yuan
added a commit
that referenced
this pull request
Aug 24, 2026
#2673 was squash-merged, so main's base bump and this branch's copy of it are unrelated histories. Three resolutions git could not get right on its own: - docker/Dockerfile: main is net-unchanged from the merge base (bump set miles-main-20260819, #2734 set it back), so git kept this branch's miles-main-20260819 — a branch that no longer exists on the Megatron remote. Take miles-main. - test_deepseek_v4_flash_4layer_ci.py: the inverse — this branch is net-unchanged, so git kept main's disabled=. Re-enable it; that is this PR. - model.py mtp_loss_scale: this branch predates 59cc3c1, so its side is the unfixed line. Take main's.
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
2 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.
#2673 landed with
MEGATRON_BRANCH=miles-main-20260819, a temporary name used whilemiles-mainstill held the pre-bump tree.On the Megatron side that has now been resolved:
miles-backup-20260819keeps the pre-bump tree (wasmiles-main,2e64d788b)miles-mainnow points at the bumped tree (235952df6)miles-main-20260819is deletedSo the temporary name no longer resolves, and this puts the Dockerfile back on
miles-main. Nothing else needs changing: the CI branch defaults,Dockerfile.rocm,docker-build.yml's fingerprint and the release lock were never moved offmiles-main, so they become correct automatically.