🔀
Rebasing & History Rewriting

git rebase Basics

Replaying Commits
💡 Rebase, EK, "STORY, ko, RE-TELL, karna", jaisa, hai, EK, NAYI, STARTING, POINT, se, — SAME, EVENTS, LEKIN, EK, DIFFERENT, (updated), BEGINNING, se, SHURU, hote, HAIN.

"git, rebase, <branch>" TUMHARE, CURRENT, branch, ke, commits, ko, "TEMPORARILY, HATA" deta hai, target, branch, ko, LATEST, VERSION, PAR, MOVE, karta hai, aur, PHIR, TUMHARE, commits, ko, USKE, UPAR, "REPLAY" kar, deta hai.

Merge, EK, "merge, commit" banata hai, — HISTORY, mein, EK, "BRANCHING" PATTERN, dikhta hai. Rebase, EK, CLEAN, LINEAR, HISTORY, banata hai.

git switch feature-branch
git rebase main
🔀
Rebase, EK, "STORY, ko, RE-TELL, karna", jaisa, hai, EK, NAYI, STARTING, POINT, se, — SAME, EVENTS, LEKIN, EK, DIFFERENT, (updated), BEGINNING, se, SHURU, hote, HAIN.
1 / 2
⚡ झट से Recap
  • Rebase current branch ke commits ko target branch ke latest par replay karta hai
  • Merge branching history banata hai, rebase linear history banata hai
  • Golden rule: shared/public branches ko kabhi rebase mat karo
इस page में (2 subtopics)

"git, rebase, <branch>" TUMHARE, CURRENT, branch, ke, commits, ko, "TEMPORARILY, HATA" deta hai, target, branch, ko, LATEST, VERSION, PAR, MOVE, karta hai, aur, PHIR, TUMHARE, commits, ko, EK-EK, kar, ke, USKE, UPAR, "REPLAY" kar, deta hai.

git switch feature-branch
git rebase main

Merge, EK, "merge, commit" banata hai, JISME, DO, PARENTS, hote, HAIN, — HISTORY, mein, EK, "BRANCHING" PATTERN, dikhta hai. Rebase, EK, CLEAN, LINEAR, HISTORY, banata hai, — JAISE, feature, commits, main, branch, se, hi, DIRECTLY, SHURU, hue, HON.

💡Tip: GOLDEN, RULE, hai: "KABHI, bhi, EK, PUBLIC/SHARED, branch, ko, rebase, mat, karo" — kyunki, rebase, EXISTING, commits, ke, HASHES, CHANGE, kar, deta hai, JISSE, DOOSRE, developers, ki, HISTORY, se, CONFLICT, ho, sakta hai.