Skip to content

Explainer videos and product demos made by your AI agent. Free and open source: a local voice (Kokoro), word timing (Whisper) and a canvas renderer turn a script into a narrated MP4.

752 B
Raw Blame

git merge vs rebase

A vertical short for Reels, Shorts and TikTok. Captions are on because the video is vertical.

hook

Your branch is behind main. [#two] You can merge it, [#or] or you can rebase it.

merge

A merge adds [#knot] one new commit that joins the two histories.

rebase

A rebase takes your commits off your branch [#replay] and adds them again on top of main, [#line] one after the other.

hashes

These are new commits, [#new] so they get new hashes.

rule

So don't rebase a branch [#shared] that other people have already pulled. [#why] Their copy still has the old commits.

outro {hold=1.2}

A merge keeps the history the way it happened. [#clean] A rebase turns it into a straight line, which is easier to read.