• 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)

8 points

If you’re going to rearrange code, have that as a separate check in from changing code.

permalink
report
reply
4 points

Give me some love for adding an indent level either showing nothing changed or you rewrote everything too.

permalink
report
reply
2 points

How do you expect it to be shown though?

permalink
report
reply
10 points

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

permalink
report
parent
reply
3 points

I think Sublime Merge does this with the conflict resolution tool

permalink
report
parent
reply
20 points

Me adding one if statement around around a code block. Ah shit I guess I own the whole function now.

permalink
report
reply
8 points

At least a good diff tool will ignore whitespace diffs.

permalink
report
parent
reply
7 points

Maybe specify a different diff algorithm? Histogram for example?

permalink
report
reply

Programmer Humor

!programmerhumor@lemmy.ml

Create post

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.

Community stats

  • 5K

    Monthly active users

  • 1.5K

    Posts

  • 33K

    Comments