[{"data":1,"prerenderedAt":64},["ShallowReactive",2],{"term-m\u002Fmerge-hell":3,"related-m\u002Fmerge-hell":59},{"id":4,"title":5,"acronym":6,"body":7,"category":40,"description":41,"difficulty":42,"extension":43,"letter":44,"meta":45,"navigation":46,"path":47,"related":48,"seo":53,"sitemap":54,"stem":57,"subcategory":6,"__hash__":58},"terms\u002Fterms\u002Fm\u002Fmerge-hell.md","Merge Hell",null,{"type":8,"value":9,"toc":33},"minimark",[10,15,19,23,26,30],[11,12,14],"h2",{"id":13},"eli5-the-vibe-check","ELI5 — The Vibe Check",[16,17,18],"p",{},"Merge hell is when you've been on a feature branch for three weeks, main has moved 400 commits, and now every file has a conflict. You try to merge, git screams, you fix a conflict, three more appear. Hours later, you're questioning your career.",[11,20,22],{"id":21},"real-talk","Real Talk",[16,24,25],{},"Merge hell describes the compounding difficulty of merging a long-lived branch back into main after significant divergence. Causes include rare rebasing, large refactors on main, missing tests that catch semantic conflicts, and large PRs. Prevented by trunk-based development, small PRs, and frequent rebasing.",[11,27,29],{"id":28},"when-youll-hear-this","When You'll Hear This",[16,31,32],{},"\"Don't let that branch sit another week — you'll be in merge hell.\" \u002F \"I spent my whole Friday in merge hell.\"",{"title":34,"searchDepth":35,"depth":35,"links":36},"",2,[37,38,39],{"id":13,"depth":35,"text":14},{"id":21,"depth":35,"text":22},{"id":28,"depth":35,"text":29},"git","Merge hell is when you've been on a feature branch for three weeks, main has moved 400 commits, and now every file has a conflict.","beginner","md","m",{},true,"\u002Fterms\u002Fm\u002Fmerge-hell",[49,50,51,52],"Merge Conflict","Rebase","Trunk Based Development","Long-Lived Branch",{"title":5,"description":41},{"changefreq":55,"priority":56},"weekly",0.7,"terms\u002Fm\u002Fmerge-hell","BvfKmnsR457OhISp4-rJvRH9-sHueYkJ-f69QFulbA4",[60],{"title":50,"path":61,"acronym":6,"category":40,"difficulty":62,"description":63},"\u002Fterms\u002Fr\u002Frebase","advanced","Rebase is like rewriting history.",1776518294798]