git merge conflict

Categories

Coding & development

Tags

merge conflict

error

version control

Git

code conflict

resolve

Use cases

• Merge conflict resolution interface
• Version control error state
• Code integration issue

Created in:

v0.0.0

Last changed:

v0.2.0

Contributors:

田建军

Icon usage examples

Bug

Feature

git merge conflict

112

8

11

Related icons

git commit horizontal

git merge

git branch

git commit vertical

git compare arrows

git compare

git fork

git pull request arrow

git pull request closed

git pull request create arrow

git pull request create

git pull request draft

git pull request

folder git 2

folder git

git branch minus

git branch plus

git graph

merge

arrow down to line

book copy

book dashed

book down

book key

book lock

book minus

book plus

book up 2

book up

message square diff

square dot

book X

book marked

bug

circle slash

circle X

cloud alert

database x

diff

file stack

folder root

line dot right horizontal

package X

refresh ccw dot

server crash

shield off

shield X

square stack

squircle dashed

triangle alert

table cells merge

badge X

ban

bomb

circle alert

circle off

clipboard X

clock alert

file exclamation point

file X

globe X

grid 2x2 X

history

octagon X

printer X

refresh cw off

square X

star X