Merge conflict

git-merge-conflict, <GitMergeConflict />

The cross draws itself and the two branches jar against each other.

1620243240

tsx

import { GitMergeConflict } from "kineticons";

// moves when the button is pointed at or focused
<button className="ki-trigger">
  <GitMergeConflict />
  Merge conflict
</button>

npm install kineticons. Works in Server Components; only the icons you import are bundled.

Merge conflict

Icons like merge conflict