Merge Conflict

Classic conflict block with emerald current section, sky incoming section, and <<< === >>> markers.

<<<<<<< CurrentHEAD
const greet = (name) =>  `Hi, ${name}!`;=======
const greet = (name: string) =>  `Merhaba, ${name}!`;>>>>>>> Incomingfeat/onboarding

Requires shadcn/ui initialized. Run npx shadcn@latest init if you haven't.

Import & use

import { Editor31 } from "@/components/beste/piece/editor31";

<Editor31
  currentBranch="HEAD"
  incomingBranch="feat/onboarding"
  currentCode={[
    "const greet = (name) =>",
    "  `Hi, ${name}!`;"
  ]}
  incomingCode={[
    "const greet = (name: string) =>",
    "  `Merhaba, ${name}!`;"
  ]}
/>