Programmer Humor

19623 readers

2 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

Keep content in english
No advertisements
Posts must be related to programming or programmer topics

founded 1 year ago

MODERATORS

[email protected]

865

Microsoft Please Fix (lemmy.zip)

submitted 6 days ago* (last edited 6 days ago) by Maven to c/[email protected]

342 comments fedilink hide all child comments

The real report

Bonus

you are viewing a single comment's thread
view the rest of the comments

[–] [email protected] 6 points 6 days ago (1 children)

So I’m normally a command line fan and have used git there. But I’m also using sublimerge and honestly I find it fantastic for untangling a bunch of changes that need to be in several commits; being able to quickly scroll through all the changed files, expand & collapse the diffs, select files, hunks, and lines directly in the gui for staging, etc. I can’t see that being any faster / easier on the command line.

[–] [email protected] 3 points 5 days ago

Heh, I guess this shows my corporate software dev experience. Whenever I've taught git workflows it was always paired with a work ticketing system where any changes you were making were ideally all one single set of changes. If you need a feature or bug fix someone else was doing that was being done on another branch which you could pull into your code early and for tracking purposes we always made sure the other person merged into main first. The only time I've seen per line manipulation with git was when someone made a ton of changes in a file and wanted to revert a handful of lines.

Everything else you mentioned I've had a web git host like gitlab or bitbucket for, but I kinda put that more into peer review workflow than git itself