glyphfox
development

Merge conflict icon

Merge conflict is an original glyphfox icon from the development set, drawn on the 24 by 24 grid with 6 shapes. Its closed shapes also give it a solid style, generated at build time. Tags: merge conflict, git, branches, clash, version control.

Customize in the icon browser

Sizes, weights and styles

Every glyphfox icon renders along three axes. The stroke grows a little below 24 px so small icons keep their presence.

Sizes

16 px
20 px
24 px
32 px
48 px

Weights

weight 1
weight 1.5
weight 2
weight 2.5
weight 3

Styles

Outline
Duotone
Solid
sharp corners

Copy the code

Pick a format. Each snippet uses the package entry point for that stack; the props work the same everywhere.

Code formats
App.jsx
import { MergeConflictIcon } from 'glyphfox/react';

<MergeConflictIcon />
App.vue
<script setup>
import { MergeConflictIcon } from 'glyphfox/vue';
</script>

<template>
  <MergeConflictIcon />
</template>
App.svelte
<script>
  import { MergeConflictIcon } from 'glyphfox/svelte';
</script>

<MergeConflictIcon />
app.component
import { GlyphFoxIcon, provideGlyphFox } from 'glyphfox-angular';

<gf-icon name="merge-conflict"></gf-icon>
index.html
<glyph-fox name="merge-conflict"></glyph-fox>
index.html
<script src="https://cdn.jsdelivr.net/npm/glyphfox@1"></script>

<glyph-fox name="merge-conflict"></glyph-fox>
index.html
<span class="gf-merge-conflict" aria-hidden="true"></span>
merge-conflict.svg
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="glyphfox glyphfox-merge-conflict" aria-hidden="true"><circle cx="6" cy="5" r="2.5"/><circle cx="18" cy="5" r="2.5"/><path d="M6 7.5C6 9.84 6.68 11.77 7.82 13.44"/><path d="M18 7.5C18 9.84 17.32 11.77 16.18 13.44"/><path d="M10 15.5l4 4"/><path d="M14 15.5l-4 4"/></svg>
data URI
data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='glyphfox glyphfox-merge-conflict' aria-hidden='true'%3E%3Ccircle cx='6' cy='5' r='2.5'/%3E%3Ccircle cx='18' cy='5' r='2.5'/%3E%3Cpath d='M6 7.5C6 9.84 6.68 11.77 7.82 13.44'/%3E%3Cpath d='M18 7.5C18 9.84 17.32 11.77 16.18 13.44'/%3E%3Cpath d='M10 15.5l4 4'/%3E%3Cpath d='M14 15.5l-4 4'/%3E%3C/svg%3E
index.html
<!-- copy node_modules/glyphfox/dist/sprite.svg to your public folder -->
<svg width="24" height="24" aria-hidden="true">
  <use href="/sprite.svg#gf-merge-conflict"></use>
</svg>
index.html
<!-- main.js: import 'glyphfox/runtime'; -->
<i data-glyph="merge-conflict"></i>
icon.js
import { renderToString } from 'glyphfox/core';
import iconMergeConflict from 'glyphfox/icons/merge-conflict';

const svg = renderToString(iconMergeConflict, { size: 24 });

// or, with every icon registered by name:
// import { toSvg } from 'glyphfox';
// toSvg('merge-conflict', { size: 24 });

Details

Namemerge-conflict
React, Vue and Svelte componentMergeConflictIcon
Icon data exporticonMergeConflict
Categoriesdevelopment
Tagsmerge conflict git branches clash version control
StylesOutline, Duotone (fill of the closed shapes), Solid
Shapes6
LicenseMIT

With a modifier badge

Add a badge in any corner with modifier or the name syntax. The icon is cut around the badge, so the result still passes the icon rules.

merge-conflict+check
merge-conflict+plus
merge-conflict+x
merge-conflict+alert

Use it in your stack

Guides with the install, the props and the pitfalls for each stack: