Branches clashing, for a merge conflict and changes that will not fold together. On a 24×24 grid in stroke, duotone and fill, free under MIT.
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
<path d="M5.5 21L5.5 12M18 15V10C18 7.79086 16.2091 6 14 6H12M3 3L8 8M8 3L3 8M18 15C19.6569 15 21 16.3431 21 18C21 19.6569 19.6569 21 18 21C16.3431 21 15 19.6569 15 18C15 16.3431 16.3431 15 18 15Z"/>
</svg>Also called
What someone searching for this drawing would have typed instead. These are the words the browser's search matches on.
- clash
- collision
- resolve
- incompatible
- version control
- repository
- source control
- vcs
Related icons
The rest of the git family first, then the Git shelf.
FAQ
Answered from git-merge-conflict's own facts: its shelf, the weights it was drawn in, its siblings and its dates.
- What is the git-merge-conflict icon for?
- Branches clashing, for a merge conflict and changes that will not fold together. It is filed under Git in Keyline Icons, drawn on the same 24×24 grid as the rest of the set. People look for it as clash, collision, resolve, incompatible, version control, repository, source control and vcs, and the browser's search matches all of those.
- What styles does the git-merge-conflict icon come in?
- All three: stroke, duotone and fill. They are drawn from the same geometry, so swapping weight never moves anything.
- Is there a square or circle version of git-merge-conflict?
- No. git-merge-conflict is drawn as a bare glyph, and the set has no boxed variant of it.
- What other icons go with git-merge-conflict?
- git-arrow-right, git-branch, git-branch-minus, git-branch-plus, git-check and git-commit-horizontal, and 12 more, all shown below. The git family is listed first, then the rest of the Git shelf, so the row under this one is the useful one even where a shelf runs long.
- How do I import git-merge-conflict in React?
- <GitMergeConflict /> is the component, and the weight decides the module: stroke from "@keyline-icons/react", duotone from "@keyline-icons/react/duotone" and fill from "@keyline-icons/react/fill". It takes the usual SVG props plus a size, so <GitMergeConflict size={16} /> and className="size-4" both work, and there is no provider or theme to set up.
- Where is the git-merge-conflict SVG?
- icons/stroke/git-merge-conflict.svg, icons/duotone/git-merge-conflict.svg and icons/fill/git-merge-conflict.svg in the repository, normalised: no wrapper, no ids and no classes to strip out. The tabs above hand you the same drawing as SVG or JSX without the download, and neither needs an install.
- When was git-merge-conflict added to the set?
- Added 8 Aug 2026, and last redrawn 8 Aug 2026. It ships in v0.1.0, so an install at that version or later has it.
Questions about the set rather than about this drawing are answered where they belong. The home page covers what the set is, how the three styles differ, why some icons come boxed and where the Figma file is; installing the set in a shadcn/ui project covers the React package, the CLI and using an icon without React. The MIT licence is stated in the footer of every page.