[{"data":1,"prerenderedAt":141},["ShallowReactive",2],{"term-r\u002Frebase":3,"related-r\u002Frebase":126},{"id":4,"title":5,"acronym":6,"body":7,"category":52,"description":108,"difficulty":109,"extension":110,"letter":111,"meta":112,"navigation":113,"path":114,"related":115,"seo":120,"sitemap":121,"stem":124,"subcategory":6,"__hash__":125},"terms\u002Fterms\u002Fr\u002Frebase.md","Rebase",null,{"type":8,"value":9,"toc":102},"minimark",[10,15,19,23,31,35,91,95,98],[11,12,14],"h2",{"id":13},"eli5-the-vibe-check","ELI5 — The Vibe Check",[16,17,18],"p",{},"Rebase is like rewriting history. Instead of merging branches (which creates a merge commit), rebase takes your changes and replays them on top of another branch, making it look like you started from the latest code all along. Cleaner history, but trickier.",[11,20,22],{"id":21},"real-talk","Real Talk",[16,24,25,26,30],{},"Rebase moves or combines a sequence of commits to a new base commit. It rewrites commit history to create a linear sequence. Interactive rebase (",[27,28,29],"code",{},"-i",") allows squashing, editing, or reordering commits. Never rebase commits that have been shared publicly.",[11,32,34],{"id":33},"show-me-the-code","Show Me The Code",[36,37,42],"pre",{"className":38,"code":39,"language":40,"meta":41,"style":41},"language-bash shiki shiki-themes material-theme-lighter material-theme material-theme-palenight","git checkout feature\ngit rebase main\n# Interactive rebase:\ngit rebase -i HEAD~3\n","bash","",[27,43,44,60,71,78],{"__ignoreMap":41},[45,46,49,53,57],"span",{"class":47,"line":48},"line",1,[45,50,52],{"class":51},"sBMFI","git",[45,54,56],{"class":55},"sfazB"," checkout",[45,58,59],{"class":55}," feature\n",[45,61,63,65,68],{"class":47,"line":62},2,[45,64,52],{"class":51},[45,66,67],{"class":55}," rebase",[45,69,70],{"class":55}," main\n",[45,72,74],{"class":47,"line":73},3,[45,75,77],{"class":76},"sHwdD","# Interactive rebase:\n",[45,79,81,83,85,88],{"class":47,"line":80},4,[45,82,52],{"class":51},[45,84,67],{"class":55},[45,86,87],{"class":55}," -i",[45,89,90],{"class":55}," HEAD~3\n",[11,92,94],{"id":93},"when-youll-hear-this","When You'll Hear This",[16,96,97],{},"\"Rebase your branch on main before merging.\" \u002F \"Don't rebase shared branches!\"",[99,100,101],"style",{},"html pre.shiki code .sBMFI, html code.shiki .sBMFI{--shiki-light:#E2931D;--shiki-default:#FFCB6B;--shiki-dark:#FFCB6B}html pre.shiki code .sfazB, html code.shiki .sfazB{--shiki-light:#91B859;--shiki-default:#C3E88D;--shiki-dark:#C3E88D}html pre.shiki code .sHwdD, html code.shiki .sHwdD{--shiki-light:#90A4AE;--shiki-light-font-style:italic;--shiki-default:#546E7A;--shiki-default-font-style:italic;--shiki-dark:#676E95;--shiki-dark-font-style:italic}html .light .shiki span {color: var(--shiki-light);background: var(--shiki-light-bg);font-style: var(--shiki-light-font-style);font-weight: var(--shiki-light-font-weight);text-decoration: var(--shiki-light-text-decoration);}html.light .shiki span {color: var(--shiki-light);background: var(--shiki-light-bg);font-style: var(--shiki-light-font-style);font-weight: var(--shiki-light-font-weight);text-decoration: var(--shiki-light-text-decoration);}html .default .shiki span {color: var(--shiki-default);background: var(--shiki-default-bg);font-style: var(--shiki-default-font-style);font-weight: var(--shiki-default-font-weight);text-decoration: var(--shiki-default-text-decoration);}html .shiki span {color: var(--shiki-default);background: var(--shiki-default-bg);font-style: var(--shiki-default-font-style);font-weight: var(--shiki-default-font-weight);text-decoration: var(--shiki-default-text-decoration);}html .dark .shiki span {color: var(--shiki-dark);background: var(--shiki-dark-bg);font-style: var(--shiki-dark-font-style);font-weight: var(--shiki-dark-font-weight);text-decoration: var(--shiki-dark-text-decoration);}html.dark .shiki span {color: var(--shiki-dark);background: var(--shiki-dark-bg);font-style: var(--shiki-dark-font-style);font-weight: var(--shiki-dark-font-weight);text-decoration: var(--shiki-dark-text-decoration);}",{"title":41,"searchDepth":62,"depth":62,"links":103},[104,105,106,107],{"id":13,"depth":62,"text":14},{"id":21,"depth":62,"text":22},{"id":33,"depth":62,"text":34},{"id":93,"depth":62,"text":94},"Rebase is like rewriting history.","advanced","md","r",{},true,"\u002Fterms\u002Fr\u002Frebase",[116,117,118,119],"Merge","Branch","Cherry-pick","Squash",{"title":5,"description":108},{"changefreq":122,"priority":123},"weekly",0.7,"terms\u002Fr\u002Frebase","1VX3NuMKqGi_vwWMwFIvb1uBsP8mfd2x7amo-HfaYeU",[127,131,134,137],{"title":117,"path":128,"acronym":6,"category":52,"difficulty":129,"description":130},"\u002Fterms\u002Fb\u002Fbranch","beginner","A branch is like creating a parallel universe for your code.",{"title":118,"path":132,"acronym":6,"category":52,"difficulty":109,"description":133},"\u002Fterms\u002Fc\u002Fcherry-pick","Cherry-pick is like copying one specific change from another branch without merging everything.",{"title":116,"path":135,"acronym":6,"category":52,"difficulty":129,"description":136},"\u002Fterms\u002Fm\u002Fmerge","Merge is like combining two parallel universes back into one. You take the changes from your branch and smoosh them into another branch.",{"title":119,"path":138,"acronym":6,"category":52,"difficulty":139,"description":140},"\u002Fterms\u002Fs\u002Fsquash","intermediate","Squash is like combining multiple save points into one.",1776518306563]