1277

I'm going to sit down and actually learn git this week (midwest.social)

submitted 2 years ago by [email protected] to c/[email protected]

84 comments fedilink hide all child comments

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

[-] [email protected] 10 points 2 years ago

I prefer rebasing on destination branch before merging. When merging you get all the conflicts at the same time. When rebasing you can address conflicts from one commit at a time. Untangling multiple small knots is easier than one huge spaghetti. Also commit history will be much cleaner.

[-] [email protected] 3 points 2 years ago

Go, Team Rebase!

this post was submitted on 09 Nov 2023

1277 points (98.3% liked)

Programmer Humor

37448 readers

6 users here now

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

Rules:

Posts must be relevant to programming, programmers, or computer science.
No NSFW content.
Jokes must be in good taste. No hate speech, bigotry, etc.

founded 6 years ago

MODERATORS

[email protected]