[{"data":1,"prerenderedAt":91},["ShallowReactive",2],{"icon-git_merge_conflict":3},{"icon":4,"details":16,"related":41,"keywords":78,"categories":88},{"slug":5,"name":6,"keywords":7,"filled":14,"regular":15,"preview":14},"git_merge_conflict","Git Merge Conflict",[8,9,10,11,12,13],"code","version control","commits","diff","error","conflict",null,"git-merge-conflict.svg",{"description":17,"legacy":18,"related":19,"variants":32,"regular":33,"category":36,"categories":37,"codepoint":38,"usage":39,"og":40},"",false,[20,21,22,23,24,25,26,27,28,29,30,31],"git_merge","git_graph","git_compare","git_compare_arrows","git_branch","git_branch_minus","git_branch_plus","git_commit_horizontal","git_commit_vertical","git_fork","git_pull_request","git_pull_request_arrow",{},{"file":15,"size":34,"body":35},24,"\u003Cg stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\">\u003Cpath d=\"M12 6h4a2 2 0 0 1 2 2v7\" \u002F>\u003Cpath d=\"M6 12v9\" \u002F>\u003Cpath d=\"m8.5 3.5-5 5\" \u002F>\u003Cpath d=\"m8.5 8.5-5-5\" \u002F>\u003Ccircle cx=\"18\" cy=\"18\" r=\"3\" \u002F>\u003C\u002Fg>","Coding & development",[36],59060,"Lucide tags git-merge-conflict with commits, diff and error. It's in Lucide's Coding & development category; similar icons include Git Merge, Git Graph and Git Compare.",true,[42,45,48,51,54,57,60,63,66,69,72,75],{"slug":20,"name":43,"file":44},"Git Merge","git-merge.svg",{"slug":21,"name":46,"file":47},"Git Graph","git-graph.svg",{"slug":22,"name":49,"file":50},"Git Compare","git-compare.svg",{"slug":23,"name":52,"file":53},"Git Compare Arrows","git-compare-arrows.svg",{"slug":24,"name":55,"file":56},"Git Branch","git-branch.svg",{"slug":25,"name":58,"file":59},"Git Branch Minus","git-branch-minus.svg",{"slug":26,"name":61,"file":62},"Git Branch Plus","git-branch-plus.svg",{"slug":27,"name":64,"file":65},"Git Commit Horizontal","git-commit-horizontal.svg",{"slug":28,"name":67,"file":68},"Git Commit Vertical","git-commit-vertical.svg",{"slug":29,"name":70,"file":71},"Git Fork","git-fork.svg",{"slug":30,"name":73,"file":74},"Git Pull Request","git-pull-request.svg",{"slug":31,"name":76,"file":77},"Git Pull Request Arrow","git-pull-request-arrow.svg",[79,81,83,84,85,87],{"name":8,"path":80},"\u002Ftag\u002Fcode\u002F",{"name":9,"path":82},"\u002Ftag\u002Fversion-control\u002F",{"name":10,"path":14},{"name":11,"path":14},{"name":12,"path":86},"\u002Ftag\u002Ferror\u002F",{"name":13,"path":14},[89],{"name":36,"path":90},"\u002Fcategory\u002Fcoding-and-development\u002F",1793042390692]