[{"data":1,"prerenderedAt":179},["ShallowReactive",2],{"term-c\u002Fconflict":3,"related-c\u002Fconflict":167},{"id":4,"title":5,"acronym":6,"body":7,"category":150,"description":151,"difficulty":152,"extension":153,"letter":154,"meta":155,"navigation":118,"path":156,"related":157,"seo":161,"sitemap":162,"stem":165,"subcategory":6,"__hash__":166},"terms\u002Fterms\u002Fc\u002Fconflict.md","Conflict",null,{"type":8,"value":9,"toc":144},"minimark",[10,15,19,23,26,30,133,137,140],[11,12,14],"h2",{"id":13},"eli5-the-vibe-check","ELI5 — The Vibe Check",[16,17,18],"p",{},"A conflict is when two people changed the exact same part of the same file differently, and Git doesn't know which version to keep. It's like two people trying to edit the same sentence in a Google Doc at the same time. You have to manually pick which version wins.",[11,20,22],{"id":21},"real-talk","Real Talk",[16,24,25],{},"A merge conflict occurs when Git cannot automatically resolve differences between two commits. The conflicting sections are marked in the file with conflict markers (\u003C\u003C\u003C\u003C\u003C\u003C\u003C, =======, >>>>>>>) and must be manually resolved.",[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-javascript shiki shiki-themes material-theme-lighter material-theme material-theme-palenight","\u003C\u003C\u003C\u003C\u003C\u003C\u003C HEAD\nconst color = 'blue'\n=======\nconst color = 'red'\n>>>>>>> feature-branch\n\n# You pick one (or combine) and remove the markers\n","javascript","",[38,39,40,53,76,82,98,113,120],"code",{"__ignoreMap":36},[41,42,45,49],"span",{"class":43,"line":44},"line",1,[41,46,48],{"class":47},"sMK4o","\u003C\u003C\u003C\u003C\u003C\u003C\u003C",[41,50,52],{"class":51},"sTEyZ"," HEAD\n",[41,54,56,60,63,66,69,73],{"class":43,"line":55},2,[41,57,59],{"class":58},"spNyl","const",[41,61,62],{"class":51}," color ",[41,64,65],{"class":47},"=",[41,67,68],{"class":47}," '",[41,70,72],{"class":71},"sfazB","blue",[41,74,75],{"class":47},"'\n",[41,77,79],{"class":43,"line":78},3,[41,80,81],{"class":47},"=======\n",[41,83,85,87,89,91,93,96],{"class":43,"line":84},4,[41,86,59],{"class":58},[41,88,62],{"class":51},[41,90,65],{"class":47},[41,92,68],{"class":47},[41,94,95],{"class":71},"red",[41,97,75],{"class":47},[41,99,101,104,107,110],{"class":43,"line":100},5,[41,102,103],{"class":47},">>>>>>>",[41,105,106],{"class":51}," feature",[41,108,109],{"class":47},"-",[41,111,112],{"class":51},"branch\n",[41,114,116],{"class":43,"line":115},6,[41,117,119],{"emptyLinePlaceholder":118},true,"\n",[41,121,123,126,130],{"class":43,"line":122},7,[41,124,125],{"class":51},"# You pick ",[41,127,129],{"class":128},"s2Zo4","one",[41,131,132],{"class":51}," (or combine) and remove the markers\n",[11,134,136],{"id":135},"when-youll-hear-this","When You'll Hear This",[16,138,139],{},"\"I've got conflicts in three files.\" \u002F \"Can you help me resolve this merge conflict?\"",[141,142,143],"style",{},"html pre.shiki code .sMK4o, html code.shiki .sMK4o{--shiki-light:#39ADB5;--shiki-default:#89DDFF;--shiki-dark:#89DDFF}html pre.shiki code .sTEyZ, html code.shiki .sTEyZ{--shiki-light:#90A4AE;--shiki-default:#EEFFFF;--shiki-dark:#BABED8}html pre.shiki code .spNyl, html code.shiki .spNyl{--shiki-light:#9C3EDA;--shiki-default:#C792EA;--shiki-dark:#C792EA}html pre.shiki code .sfazB, html code.shiki .sfazB{--shiki-light:#91B859;--shiki-default:#C3E88D;--shiki-dark:#C3E88D}html pre.shiki code .s2Zo4, html code.shiki .s2Zo4{--shiki-light:#6182B8;--shiki-default:#82AAFF;--shiki-dark:#82AAFF}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":55,"depth":55,"links":145},[146,147,148,149],{"id":13,"depth":55,"text":14},{"id":21,"depth":55,"text":22},{"id":28,"depth":55,"text":29},{"id":135,"depth":55,"text":136},"git","A conflict is when two people changed the exact same part of the same file differently, and Git doesn't know which version to keep.","intermediate","md","c",{},"\u002Fterms\u002Fc\u002Fconflict",[158,159,160],"Merge","Rebase","Pull",{"title":5,"description":151},{"changefreq":163,"priority":164},"weekly",0.7,"terms\u002Fc\u002Fconflict","3MRQvOY5vpTXBDX4_APrbaNijjgnQ8m1VdFcVZNuh8s",[168,172,175],{"title":158,"path":169,"acronym":6,"category":150,"difficulty":170,"description":171},"\u002Fterms\u002Fm\u002Fmerge","beginner","Merge is like combining two parallel universes back into one. You take the changes from your branch and smoosh them into another branch.",{"title":160,"path":173,"acronym":6,"category":150,"difficulty":170,"description":174},"\u002Fterms\u002Fp\u002Fpull","Pull is the opposite of push — it downloads everyone else's latest changes from the cloud to your computer.",{"title":159,"path":176,"acronym":6,"category":150,"difficulty":177,"description":178},"\u002Fterms\u002Fr\u002Frebase","advanced","Rebase is like rewriting history.",1776518268548]