Skip to content

git-merge-conflict

code • version control • commits • diff • error • conflict

Created:

v0.568.0

Last changed:

v0.568.0

Contributors:

timmy471colebemiscsandmankarsa-mistmereericfennis
html
<script>
import { createIcons, gitMergeConflict } from 'lucide';

createIcons({
  icons: {
    gitMergeConflict
  }
});
</script>

<i data-lucide="git-merge-conflict"></i>  
tsx
import { GitMergeConflict } from 'lucide-react';

const App = () => {
  return (
    <GitMergeConflict />
  );
};

export default App;
vue
<script setup>
import { GitMergeConflict } from 'lucide-vue-next';
</script>

<template>
  <GitMergeConflict />
</template>
svelte
<script>
import { GitMergeConflict } from 'lucide-svelte';
</script>

<GitMergeConflict />
tsx
import { GitMergeConflict } from 'lucide-preact';

const App = () => {
  return (
    <GitMergeConflict />
  );
};

export default App;
tsx
import { GitMergeConflict } from 'lucide-solid';

const App = () => {
  return (
    <GitMergeConflict />
  );
};

export default App;
tsx
// app.module.ts
import { LucideAngularModule, GitMergeConflict } from 'lucide-angular';

@NgModule({
  imports: [
    LucideAngularModule.pick({ GitMergeConflict })
  ],
})

// app.component.html
<lucide-icon name="git-merge-conflict"></lucide-icon>
html
<div class="icon-git-merge-conflict"></div>

See this icon in action

Bug
Feature
Git
112
8
11