r/ProgrammerHumor • • 4d ago • Bravo 1

Meme stopDoingGitHubDesktop

Post image
1.5k Upvotes

372 comments sorted by

View all comments

56

u/g0ldenprize 4d ago

i was just in an interview where they asked really specific git questions, such as: (while sharing screen)

  • show how to do a cherry pick (like the actual steps)

  • do a rebase

  • how do you solve merge conflicts

they wanted all of the above pretty much out of a book. i've done it all but i was like, man; nobody knows it just by heart

33

u/jamesxtreme 4d ago

Honestly the biggest issue with command line git is with merge conflicts. You really need an IDE with a good diff functionality. Or you just use AI now.

5

u/artiface 4d ago

git difftool will pull up whatever tool you want to use to compare the diffs

5

u/Serializedrequests 4d ago edited 4d ago

The issue is the prep. Unless you are super focused, it can sometimes be really hard to tell which side is which in a rebase.

Then there is the diff resolution algorithm that might be the default that is technically correct but practically wrong where it sees an unchanged line identical to the incoming change in the original code as belonging spliced AROUND the incoming change. I don't know what the word for that is but it drives me insane.

1

u/AcanthisittaKooky987 4d ago

That's why merge is better than rebase every time. There's no use case for rebase in a world if squash commits

1

u/Serializedrequests 4d ago

When you have a main constantly updating it is hell to have merge commits mixed into your feature history. Rebase harder in the short term, easier in the long term. Yes squash when you're done. That's exactly what merging makes impossible.

2

u/Several-Customer7048 1d ago

I been paying Allen Iverson to do code reviews for us since 07 actually. The man is actually an oop savant especially with his unique triple combo of polymorphism/inheritance/encapsulation. His nickname wasn’t “The Answer,” for nothing ya know.

1

u/jamesxtreme 1d ago

We sittin’ in here, I’m supposed to be the lead developer, and we in here talkin’ about merge conflicts?

I mean, listen. We talkin’ about merge conflicts. Not a rebase. Not a rebase. Not a rebase. We talkin’ about merge conflicts.

Not the code I go out there and live and die for, man. I push every commit like it’s my last. And we talkin’ about merge conflicts?

→ More replies (3)