Skip to content

Git Branch Conflicts

The git-branch-conflicts icon represents conflicts or merge issues in a branch in a Git version control system.

Add shadcn.io to your AI agent. · Pro It installs Git Branch Conflicts, or any of 294k icons, from a prompt, with Pro.

Set up MCP

Exports at 24 × 24 px

Git Branch Conflicts icon from Codicons
Get Pro

538 in CodiconsCC BY 4.0 license (opens in a new tab)Free to copy and download

Code

Git Branch Conflicts in your framework

In any framework. Customize it above, and the code follows.

export const GitBranchConflictsIcon = (props: React.SVGProps<SVGSVGElement>) => (
  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 16 16" {...props}>
    <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>
);

Codicons

Icons that share its tags, in the same style.

  • Git Branch icon from Codicons
  • Git Branch Changes icon from Codicons
  • Git Branch Staged Changes icon from Codicons
  • Git Commit icon from Codicons
  • Gist icon from Codicons
  • Gist Secret icon from Codicons
  • File Submodule icon from Codicons
  • Git Compare icon from Codicons
  • Git Fetch icon from Codicons
  • Git Lens icon from Codicons
  • Git Merge icon from Codicons
  • Git Pull Request icon from Codicons
  • Git Pull Request Closed icon from Codicons
  • Git Pull Request Create icon from Codicons
  • Git Pull Request Done icon from Codicons
  • Git Pull Request Draft icon from Codicons
  • Git Pull Request Go To Changes icon from Codicons
  • Git Pull Request New Changes icon from Codicons
  • Git Stash icon from Codicons
  • Git Stash Apply icon from Codicons
  • Git Stash Pop icon from Codicons
  • Repo Forked icon from Codicons
  • Repo Push icon from Codicons
  • Repo Selected icon from Codicons

Skip the copy and paste. With Pro, your AI agent finds and installs any Codicons icon from a prompt.

Get Pro

Tags

Browse by tag

Git Branch Conflicts is tagged Git, version-control and branch. Related tags follow; each opens its icons from every library.

Pricing

Codicons MCP, with Pro

Ask for Git Branch Conflicts or any of 538 Codicons icons and your agent installs it. The MCP comes with every Pro plan, with 6,000+ blocks and 14 premium templates. The icons stay free.

4.9/5 out of 5 · 150+ reviewsfrom 150+ founders and developers.

Billed once a year in USD. Cancel anytime.

Individual

For personal projects & open source

$32instead of $49/mo

$389 billed yearly

  • How many people can use the license.Seats: 1 seat
  • Client work, SaaS products and anything you charge for.Commercial use: Personal & open source only
  • Production-ready React sections: hero, pricing, features, dashboards and more.Pro blocks: 6,000+ blocks
  • Complete multi-page sites you can ship as they are.Templates: All 14 templates
  • React icons from every major library, installable with one command.React icons: 294k+ icons
  • Presets that restyle every block, in light and dark.Themes: All 59 themes
  • Lets your AI editor search, preview and install blocks for you.MCP server: Basic usage
  • Priority requests are answered first.Support: Standard

Team

Most popular

For freelancers, agencies & startups

$66instead of $99/mo

$789 billed yearly · ≈ $13/dev/mo

Everything in Individual, plus

  • How many people can use the license.Seats: Up to 5 seats
  • Client work, SaaS products and anything you charge for.Commercial use: Included
  • Lets your AI editor search, preview and install blocks for you.MCP server: High usage
  • Priority requests are answered first.Support: Priority

Organization

For companies with larger teams

$132instead of $199/mo

$1,589 billed yearly

Everything in Team, plus

  • How many people can use the license.Seats: Unlimited seats
  • Lets your AI editor search, preview and install blocks for you.MCP server: Unlimited usage
  • Secure checkout via Stripe
  • Code lives in your repo
  • Keep what you've shipped if you cancel
  • License terms

FAQ

Frequently asked questions

What the Git Branch Conflicts icon means and where it's used, then how to install, style and license it.

Install Git Branch Conflicts from a prompt

MCP, 6,000+ blocks and 14 premium templates in every Pro plan. The icons stay free.

Get Pro