Video: Merge branches with diverged history
The video plays in YouTube’s player, in privacy-enhanced mode.
- 4 min video
- English narration · English and Arabic captions
- Watch on YouTube
Combine the published workflow-card feature with main's independent accessibility and footer changes. Verify a real two-parent merge and the complete resulting page.
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 independent accessibility change.
- Record only that intended main change.
- Inspect the actual diverged ancestry.
- Merge the feature into current main.
- Choose the recording mode deliberately.
- Wait for the real merge result.
- Verify both parents and combined content.
- Keep this merge local until reviewed.
- What makes a merge commit distinct?
- Ancestry is defined by parent IDs, not message or color.
- Which evidence is needed?
- A structurally valid merge can still have wrong content.
- What happens to F1's identity?
- Merge connects existing commits rather than replaying them.
- Choose ff-only on this diverged input: result?
- Neither tip is the required descendant for a simple fast-forward.
- No textual conflict means tests unnecessary?
- Semantic correctness needs content review and tests.
- What is the final scope?
- No push is part of this local merge.
- 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.