Git Branch Conflicts

The git-branch-conflicts icon represents conflicts or merge issues in a branch in a Git version control system. It typically consists of a tree-like structure or a branch symbol with indicators of conflicts.

The git-branch-conflicts icon is commonly used in Git-based platforms, such as GitHub, to represent conflicts or merge issues in branches in a repository. It can also be found in software applications focused on version control, like Git clients and IDEs.

The git-branch-conflicts icon communicates that an action or feature is related to resolving conflicts or merge issues. It helps users quickly identify and access branch-related features.

Git Branch Conflicts is one of 538 icons in Codicons, made by Microsoft Corporation and released under CC BY 4.0. It is drawn on a 16 × 16 grid.

Sign in (it's free), then open Get icon, Install with shadcn CLI, and pick your package manager to copy the command. It adds GitBranchConflictsIcon to components/icons/codicon-git-branch-conflicts.tsx: one file, a size prop (24 by default) and every SVG prop, with no icon package.

Copy it as React (from Get icon, or the Code section): a typed GitBranchConflictsIcon component you paste into your project, with no package to install. Only the icons you import reach your bundle. It works in Next.js and any React app.

Open Get icon, then Copy as code, and pick Vue, Svelte, Angular, Solid or Preact; the Code section shows each one too. Every version is one self-contained component with the SVG inside, and SVG and data URL copies are there for plain HTML and CSS.

With Pro, the shadcn.io MCP server lets Claude Code, Cursor or any MCP client find the Git Branch Conflicts icon, or any of 538 Codicons icons, and install it from a prompt.

It's drawn in currentColor, so it takes the text color wherever you use it: a class like text-primary recolors it. To bake a color in, set one in Customize before you copy.

Set width and height on the component, or a class like size-6. It's drawn on a 16 × 16 grid, so it stays sharp at any size. Customize also sets the size it exports at, its padding and rotation.

Yes. It follows the text color, so with text-foreground (or any theme token) it changes with your light and dark themes. The icon is a vector, so it needs no separate dark asset.

Next to a visible label it's decoration: add aria-hidden="true" so screen readers skip it. Standing alone, as in an icon button, give the button a name instead, like aria-label="Git Branch Conflicts", so screen readers say what it does.

Yes. GitBranchConflictsIcon passes every SVG prop to the svg element, so <GitBranchConflictsIcon aria-hidden="true" /> works, and so do role="img" with aria-label, or a title child, when it carries meaning on its own.

Yes. Open Get icon, then Download file: SVG for code or design tools like Figma; PNG, WebP or JPEG at 512px; or an ICO favicon with 16, 32 and 48px inside. Each one uses what you set in Customize.

Yes, with credit: CC BY 4.0 asks you to credit the author (Microsoft Corporation) where you use the icons. The full terms are in the license, linked on this page.

Yes. CC BY 4.0 asks you to credit the author where you use the icons, for example "Icons by Microsoft Corporation, CC BY 4.0" on an about or credits page.

Yes. Copying and downloading it is free, and the shadcn CLI install only needs a free account.

Its tags are Git, version-control and branch. Each tag page lists the icons that carry it from every library, which is the quickest way to find a match for Git Branch Conflicts in another set.