Merge Conflict

<<<<<<< Current
const greet = (name) =>  `Hi, ${name}!`;
=======
const greet = (name: string) =>  `Hello, ${name}!`;
>>>>>>> Incoming
About this piece

Merge Conflict

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

Usage

The import and the props worth knowing about, in one place.

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

<Editor31
  currentCode={[
    "const greet = (name) =>",
    "  `Hi, ${name}!`;"
  ]}
  incomingCode={[
    "const greet = (name: string) =>",
    "  `Hello, ${name}!`;"
  ]}
  bordered={false}
/>

More Editor pieces

View all Editor
const user = { name: 'Nils' };
const msg = greet(user.name);
console.log(msg);
 
Switch branch…
  • feat/onboarding
  • main
  • feat/ai-suggest
  • chore/cleanup
const value = user.prfile.name;
  • Rename to 'profile'Preferred
  • Add missing property 'prfile'
  • Disable rule for this line
button.tsxSaved
--primary:  #f43f5e;
--accent:  #8b5cf6;
--surface:  #0ea5e9;
1// TODO migrate to server components
2// FIXME handles null state poorly
3// NOTE revisit once design lock lands