[{"data":1,"prerenderedAt":104},["ShallowReactive",2],{"glossary-page-\u002Fglossary\u002Fmerge-conflict":3},{"id":4,"title":5,"body":6,"description":91,"extension":92,"meta":93,"navigation":99,"path":100,"seo":101,"stem":102,"__hash__":103},"docs\u002Fglossary\u002Fmerge-conflict.md","Merge Conflict",{"type":7,"value":8,"toc":83},"minimark",[9,15,20,28,32,35,51,55,58,62],[10,11,12],"glossary-title",{},[13,14,5],"p",{},[16,17,19],"h2",{"id":18},"what-is-a-merge-conflict","What Is a Merge Conflict?",[13,21,22,23,27],{},"A ",[24,25,26],"strong",{},"merge conflict"," occurs when version control cannot automatically combine changes made in overlapping parts of a codebase.\nThe conflict must be resolved manually before the branch or pull request can be merged.",[16,29,31],{"id":30},"why-merge-conflicts-matter","Why Merge Conflicts Matter",[13,33,34],{},"Merge conflicts matter because they:",[36,37,38,42,45,48],"ul",{},[39,40,41],"li",{},"interrupt developer flow,",[39,43,44],{},"increase rework,",[39,46,47],{},"delay pull request completion,",[39,49,50],{},"often grow when work sits in review too long.",[16,52,54],{"id":53},"how-oobeya-uses-merge-conflict-context","How Oobeya Uses Merge Conflict Context",[13,56,57],{},"Oobeya can help teams trace whether slow review flow, large batch size, or branch age is increasing merge conflict risk.",[16,59,61],{"id":60},"related-terms","Related Terms",[36,63,64,71,77],{},[39,65,66],{},[67,68,70],"a",{"href":69},"\u002Fglossary\u002Fbranch","Branch",[39,72,73],{},[67,74,76],{"href":75},"\u002Fglossary\u002Fpull-request","Pull Request",[39,78,79],{},[67,80,82],{"href":81},"\u002Fglossary\u002Fcode-review","Code Review",{"title":84,"searchDepth":85,"depth":85,"links":86},"",2,[87,88,89,90],{"id":18,"depth":85,"text":19},{"id":30,"depth":85,"text":31},{"id":53,"depth":85,"text":54},{"id":60,"depth":85,"text":61},"A merge conflict occurs when version control cannot automatically combine changes made in overlapping parts of a codebase.","md",{"category":94,"tags":95},"M",[96,97,98],"Git","Version Control","Collaboration",true,"\u002Fglossary\u002Fmerge-conflict",{"title":5,"description":91},"glossary\u002Fmerge-conflict","shuN61cbP1YIowVDL7Tv269ElU-Mv6tKeq_7aRdNdao",1775745636458]