Video: Rebase unpublished work onto a new base
The video plays in YouTube’s player, in privacy-enhanced mode.
- 5 min video
- English narration · English and Arabic captions
- Watch on YouTube
Replay one unpublished signup commit on an independently updated base. Preserve the old tip and verify new identity, new parent and unchanged intended signup content.
Read the full lesson
The article has every step and command from the video, the practice exercise and the questions.
Video transcript
The narration of the video, cue by cue.
- Start from the exact checkpoint.
- Name the branch, index and working version.
- Prepare only the isolated course copy.
- Prepare the private divergence and rescue ref.
- Check which branch is actually current.
- Choose the intended new base.
- Keep unrelated replay options off.
- Wait for the actual replay result.
- The new parent means a new commit identity.
- Verify the full combined content.
- Preserve the old tip without publishing it.
- What is replayed?
- The selected commit range is recreated on the new base.
- What must be checked?
- Scope determines which commits and refs may move.
- S replayed on N: parent?
- The new commit S′ is parented by N.
- Change input: same hero line changed on both sides.
- Replay can stop; resolution and continuation are explicit.
- Can --abort undo an already finished rebase?
- Abort needs an active operation; completed recovery needs preserved evidence.
- What proves this result?
- Messages can stay the same while identities change.
- Verify the actual result, not just a message.
- Predict the changed input before acting.
- Preserve useful work before recovery.
- Prove the checkpoint before continuing.
- Keep the verified result for the next step.