Conflict

A merge conflict — two changes that cannot both apply to the same lines

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

outline · regular · 2.0024px

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

<Conflict />

See it in action

outline · 2.00

Buttons16px

Run conflictSecondary

Ghost

Sidebar18px

Workspace

Conflict12Accessibility testAdd runAPI

Toolbar16px · in a row

Conflict

OverviewRunsLogs

Knocked out16 · 20px

Conflict

conflict

Run

4 running

A list20px

Conflict

Updated 4 minutes ago

active

Add run

Idle since Tuesday

idle

API

Idle since Tuesday

idle

A metric20px · beside a number

+12.4%

1,284

Conflict events this week

Icons that go with Conflict

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

pinch collapse event-stream learning-rate fireworks end-to-end

More Developer Tools icons

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

See all 287 →

accessibility-test add-run api api-analytics api-bridge api-console api-contract api-deprecate api-diff api-key-rotate api-lint api-mock api-playground api-usage api-version arrange-act-assert assert-check assert-fail

Improve this icon on GitHub

Ship Conflict in your next build

Conflict is one of 5,287 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