[{"data":1,"prerenderedAt":143},["ShallowReactive",2],{"term-s\u002Fsquash":3,"related-s\u002Fsquash":127},{"id":4,"title":5,"acronym":6,"body":7,"category":48,"description":110,"difficulty":111,"extension":112,"letter":113,"meta":114,"navigation":71,"path":115,"related":116,"seo":121,"sitemap":122,"stem":125,"subcategory":6,"__hash__":126},"terms\u002Fterms\u002Fs\u002Fsquash.md","Squash",null,{"type":8,"value":9,"toc":104},"minimark",[10,15,19,23,26,30,93,97,100],[11,12,14],"h2",{"id":13},"eli5-the-vibe-check","ELI5 — The Vibe Check",[16,17,18],"p",{},"Squash is like combining multiple save points into one. Instead of having 15 tiny commits like 'fix typo', 'oops forgot file', 'actually fix it', you squash them all into one clean commit that says 'Add login feature'. Much cleaner history!",[11,20,22],{"id":21},"real-talk","Real Talk",[16,24,25],{},"Squashing combines multiple commits into a single commit. This is typically done during an interactive rebase or when merging a PR. It results in a cleaner, more readable commit history.",[11,27,29],{"id":28},"show-me-the-code","Show Me The Code",[31,32,37],"pre",{"className":33,"code":34,"language":35,"meta":36,"style":36},"language-bash shiki shiki-themes material-theme-lighter material-theme material-theme-palenight","git rebase -i HEAD~5\n# Mark commits as 'squash' or 's' in the editor\n\n# Or squash merge a PR:\ngit merge --squash feature-branch\n","bash","",[38,39,40,59,66,73,79],"code",{"__ignoreMap":36},[41,42,45,49,53,56],"span",{"class":43,"line":44},"line",1,[41,46,48],{"class":47},"sBMFI","git",[41,50,52],{"class":51},"sfazB"," rebase",[41,54,55],{"class":51}," -i",[41,57,58],{"class":51}," HEAD~5\n",[41,60,62],{"class":43,"line":61},2,[41,63,65],{"class":64},"sHwdD","# Mark commits as 'squash' or 's' in the editor\n",[41,67,69],{"class":43,"line":68},3,[41,70,72],{"emptyLinePlaceholder":71},true,"\n",[41,74,76],{"class":43,"line":75},4,[41,77,78],{"class":64},"# Or squash merge a PR:\n",[41,80,82,84,87,90],{"class":43,"line":81},5,[41,83,48],{"class":47},[41,85,86],{"class":51}," merge",[41,88,89],{"class":51}," --squash",[41,91,92],{"class":51}," feature-branch\n",[11,94,96],{"id":95},"when-youll-hear-this","When You'll Hear This",[16,98,99],{},"\"Squash your commits before merging.\" \u002F \"Use squash merge for cleaner history.\"",[101,102,103],"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":36,"searchDepth":61,"depth":61,"links":105},[106,107,108,109],{"id":13,"depth":61,"text":14},{"id":21,"depth":61,"text":22},{"id":28,"depth":61,"text":29},{"id":95,"depth":61,"text":96},"Squash is like combining multiple save points into one.","intermediate","md","s",{},"\u002Fterms\u002Fs\u002Fsquash",[117,118,119,120],"Rebase","Commit","Merge","Pull Request",{"title":5,"description":110},{"changefreq":123,"priority":124},"weekly",0.7,"terms\u002Fs\u002Fsquash","HGgt2owLDTq-_weo4BFH1mM23OU058R9L0SJK2uK6MY",[128,132,135,139],{"title":118,"path":129,"acronym":6,"category":48,"difficulty":130,"description":131},"\u002Fterms\u002Fc\u002Fcommit","beginner","A commit is like pressing the save button in a video game.",{"title":119,"path":133,"acronym":6,"category":48,"difficulty":130,"description":134},"\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":120,"path":136,"acronym":137,"category":48,"difficulty":130,"description":138},"\u002Fterms\u002Fp\u002Fpull-request","PR","A pull request is like raising your hand in class and saying 'Hey, I made some changes — can someone check my work before we make it official?",{"title":117,"path":140,"acronym":6,"category":48,"difficulty":141,"description":142},"\u002Fterms\u002Fr\u002Frebase","advanced","Rebase is like rewriting history.",1776518314746]