588

diff tools cannot handle moving code blocks (lemmy.ca)

submitted 1 year ago* (last edited 1 year ago) by PeriodicallyPedantic@lemmy.ca to c/programmerhumor@lemmy.ml

37 comments fedilink hide all child comments

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

[-] Scrollone@feddit.it 3 points 1 year ago

I think Sublime Merge does this with the conflict resolution tool

this post was submitted on 20 Oct 2023

588 points (97.9% liked)

Programmer Humor

32415 readers

330 users here now

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

Rules:

Posts must be relevant to programming, programmers, or computer science.
No NSFW content.
Jokes must be in good taste. No hate speech, bigotry, etc.

founded 5 years ago

MODERATORS

AgreeableLandscape@lemmy.ml

cat_programmer@lemmy.ml