git-branch-conflicts

pnpm dlx shadcn@latest add https://opensourceicon.com/r/codicon/git-branch-conflicts.json

<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 16 16"><path fill="currentColor" d="M5.07 11.07v.002A1.49 1.49 0 0 1 6.2 10.05q.151-.551.407-1.05H6.5c-.565 0-1.081.195-1.5.512V4.949C6.14 4.717 7 3.707 7 2.5C7 1.121 5.879 0 4.5 0A2.5 2.5 0 0 0 2 2.5c0 1.208.86 2.217 2 2.449v6.101c-1.14.232-2 1.242-2 2.449c0 1.379 1.121 2.5 2.5 2.5a2.5 2.5 0 0 0 2.329-1.611a5.46 5.46 0 0 1-.828-2.872a2.5 2.5 0 0 0-.931-.446M2.999 2.501c0-.827.673-1.5 1.5-1.5s1.5.673 1.5 1.5s-.673 1.5-1.5 1.5s-1.5-.673-1.5-1.5m1.5 12.5c-.827 0-1.5-.673-1.5-1.5s.673-1.5 1.5-1.5s1.5.673 1.5 1.5s-.673 1.5-1.5 1.5M9.22 6.503a5.5 5.5 0 0 1 .946-.331A1.5 1.5 0 0 1 10 5.501c0-.827.673-1.5 1.5-1.5s1.5.673 1.5 1.5c0 .243-.064.468-.166.671q.492.123.946.331a2.5 2.5 0 0 0 .219-1.002c0-1.379-1.121-2.5-2.5-2.5a2.5 2.5 0 0 0-2.5 2.5c0 .358.084.694.22 1.001zm2.279.498a4.5 4.5 0 1 0 0 9a4.5 4.5 0 0 0 0-9M10.999 9a.5.5 0 1 1 1 0v2.501a.5.5 0 0 1-.5.5a.5.5 0 0 1-.5-.5zm.501 5.251a.75.75 0 1 1 0-1.5a.75.75 0 0 1 0 1.5"/></svg>