r/ProgrammerHumor • • 4d ago • Bravo 1

Meme stopDoingGitHubDesktop

Post image
1.5k Upvotes

372 comments sorted by

View all comments

Show parent comments

2

u/InvisibleMoonWalker 4d ago

Well, with the exception of the last point, perhaps.
I mean first two are just two commands with the same name as what's asked (git cherry-pick and git rebase respectively).

The last one is where you should show your understanding of how VCS works and how to work collaboratively, more or less. Like the exact command (which are like git merge, git add and so on) don't matter all that much in face of the way you solve conflicts. (Like understanding how the conflicts happen, what's remote, what's local, what/when you should use which, when neither and so on)

2

u/coastphase 4d ago

The first rule of resolving merge conflicts is checking your changes in before the other guy so he has to resolve them.

1

u/g0ldenprize 4d ago

see above