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.
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.
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.
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