this post was submitted on 09 Nov 2023
1228 points (98.2% liked)

Programmer Humor

32426 readers
700 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

founded 5 years ago
MODERATORS
 
you are viewing a single comment's thread
view the rest of the comments
[–] Netrunner@programming.dev 5 points 1 year ago (3 children)

If you can't use git I don't see how you're gonna do with other things. It's dead simple.

[–] jack@monero.town 28 points 1 year ago (2 children)

Solving merge conflicts or rebasing is not simple

[–] lightnegative@lemmy.world 13 points 1 year ago (1 children)

Do it enough times and it stops being scary.

Using a tool like VSCode to perform the actual merges on individual files also helps because it shows what "yours" and "theirs" changes are from a user perspective, not a git perspective

[–] boomzilla@programming.dev 2 points 1 year ago

The 3-way merge editor in VSCode is a fantastic tool. Really helps in visualizing what comes from where and preventing merge accidents.

[–] buzziebee@lemmy.world 2 points 1 year ago

It's doable once you know what you're doing. I can do it all via the cli, but I personally use gitkraken most of the time and it's just so much easier and more ergonomic.

I also see a lot of the Devs who insist they know what they're doing create horrible messes of their branches super easily via the commit tree. People should just use whatever works best for them to get the job done.

[–] oce@jlai.lu 12 points 1 year ago* (last edited 1 year ago) (1 children)

If it was dead simple you wouldn't need to learn 10 new concepts and google commands regularly even after using it for a couple of years. You probably forgot how you struggled at first. I have taught it multiple times and I see how beginners struggle.

[–] sajran@lemmy.ml 4 points 1 year ago

I would actually say it's VERY complicated but in daily work you probably need like 5 commands and those aren't hard at all.