Resolving Merge Conflicts 🌿

// Why Merge Conflicts Happen
console.log("=== What Causes a Conflict? ===");
console.log("A conflict occurs when two branches modify the SAME");
console.log("lines in the SAME file, and Git can't decide which to keep.");
console.log();

console.log("=== Scenario ===");
console.log("Original file (main, line 5):");
console.log('  color: blue;');
console.log();

console.log("Alice's branch changes line 5 to:");
console.log('  color: red;');
console.log();

console.log("Bob's branch changes line 5
...

// Reading Conflict Markers
console.log("=== Conflict Markers Explained ===");
console.log("Git marks conflicts in the file with special markers:");
console.log();

console.log("  body {");
console.log("    font-size: 16px;");
console.log("  <<<<<<< HEAD");
console.log("    color: red;          ← YOUR changes (current branch)");
console.log("  =======");
console.log("    color: green;        ← THEIR changes (incoming branch)");
console.log("  >>>>>>> feature-branch");
console.log("    margin: 0;
...

// Step-by-Step: Resolving a Conflict
console.log("=== Conflict Resolution Workflow ===");
console.log();

const steps = [
  { step: "Merge triggers conflict", cmd: "git merge feature-auth", out: "CONFLICT in src/App.js" },
  { step: "Check which files conflict", cmd: "git status", out: "both modified: src/App.js" },
  { step: "Open conflicted file", cmd: "code src/App.js", out: "(see conflict markers)" },
  { step: "Edit: choose/combine changes", cmd: "(manually edit the file)", out: "Remove al
...

// Preventing & Minimizing Conflicts
console.log("=== Prevention Strategies ===");
console.log();

const strategies = [
  { strategy: "Pull frequently", why: "Stay up-to-date with main to reduce divergence" },
  { strategy: "Small, focused branches", why: "Less code changed = fewer potential conflicts" },
  { strategy: "Communicate with team", why: "Know who's working on what files" },
  { strategy: "Merge main into your branch regularly", why: "Catch conflicts early while they're small" },
  { 
...