• Adding a line: ✅
  • Removing a line: ✅
  • Modifying a line: ✅
  • Moving a codeblock: ❌ i see you’ve rewritten everything, let me just highlight it all.

RIP reviewers on my PR.

(Meme created by my coworker)

    • Scrollone
      link
      fedilink
      arrow-up
      3
      ·
      11 months ago

      I think Sublime Merge does this with the conflict resolution tool