this post was submitted on 20 Oct 2023
569 points (97.8% liked)

Programmer Humor

32692 readers
275 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

founded 5 years ago
MODERATORS
 
  • 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)

you are viewing a single comment's thread
view the rest of the comments
[–] [email protected] 10 points 1 year ago (1 children)

For example, on side by side views, you can draw a box around it on both sides, and draw a line connecting the two

[–] [email protected] 3 points 1 year ago

I think Sublime Merge does this with the conflict resolution tool