Git merge conflict

Two branches meeting at a cross instead of a commit — a merge that does not go through by itself

Category: Developer Tools
Group: version-control
Added: 0.6.3
Licence: MIT

outline · regular · 2.0024px

import { GitMergeConflict } from "@iconmind/react";

<GitMergeConflict />

See it in action

outline · 2.00

Buttons16px

Run git merge conflictSecondary

Ghost

Sidebar18px

Workspace

Git merge conflict12Add runAPIAPI bridge

Toolbar16px · in a row

Git merge conflict

OverviewRunsLogs

Knocked out16 · 20px

Git merge conflict

git-merge-conflict

Run

4 running

A list20px

Git merge conflict

Updated 4 minutes ago

active

API

Idle since Tuesday

idle

API bridge

Idle since Tuesday

idle

A metric20px · beside a number

+12.4%

1,284

Git merge conflict events this week

Icons that go with Git merge conflict

The concepts this one usually appears beside, not just the ones filed near it.

git-merge remove-goal goal-filter goal-trigger goal-forward goal-at-risk

More Developer Tools icons

187 icons across 8 groups, drawn to the same grid and the same stroke.

See all 187 →

add-run api api-bridge assert-check assert-fail assert-pass assertion atomic-op autocomplete barrel-file bench-run benchmark-code block-alert braces branch-git breakpoint breakpoint-conditional breakpoint-log

Improve this icon on GitHub

Ship Git merge conflict in your next build

Git merge conflict is one of 2,437 icons compiled from a single grid — outline and duotone, three weights, every cell generated rather than redrawn. MIT licensed: commercial use, no attribution, no seat count.

Browse Developer Tools Install the package Request an icon