Video: Pull with fast-forward, merge or rebase
The video plays in YouTube’s player, in privacy-enhanced mode.
- 6 min video
- English narration · English and Arabic captions
- Watch on YouTube
Choose an explicit pull policy after inspecting divergence. Compare fast-forward-only refusal, merge and private rebase using three copies and one isolated local server.
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.
- Name the upstream and preserve all three inputs.
- Fast-forward only refuses this divergence.
- A refusal can follow a successful fetch.
- The merge policy preserves both histories.
- Replay only the private topic.
- Compare parents and complete trees separately.
- Write the reviewed pull policy afterward.
- Restore the previous app-wide policy.
- What is pull here?
- Pull has a transport phase and policy-governed local phase.
- What can happen on ff-only refusal?
- Fetch can finish before integration refuses divergence.
- Private replay onto N: resulting parent?
- Rebase creates S′ on N, unlike merge K.
- Change current work to published shared topic: rebase still automatic advice?
- Private-only assumptions no longer hold.
- Palette policy command changes only one pull?
- The source writes general.pullMode until another choice restores it.
- What proves comparison?
- Compare actual state rather than command silence.
- 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.