this post was submitted on 04 Apr 2024
1114 points (98.1% liked)

Programmer Humor

19564 readers
1303 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 1 year ago
MODERATORS
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
1114
Rebase Supremacy (programming.dev)
submitted 7 months ago by JPDev@programming.dev to c/programmer_humor@programming.dev
238 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] Aux@lemmy.world 7 points 7 months ago (2 children)

Well, rebase allows you to resolve the same conflict ten times in a row instead of doing it once. How cool is that?

[–] expr@programming.dev 4 points 7 months ago (1 children)

Nope, you just need to do it once: https://git-scm.com/book/en/v2/Git-Tools-Rerere.

[–] Aux@lemmy.world 1 points 7 months ago

Why would I ruin all the fun?

[–] jjjalljs@ttrpg.network 0 points 7 months ago (1 children)

Squash your branch first

[–] rapist1@lemmy.world 2 points 7 months ago (1 children)

Doesn't this defeat the purpose, may as well merge then no?

[–] jjjalljs@ttrpg.network 1 points 7 months ago

Do not merge your unfinished stuff into main.

I don't like merging main into my branch because I don't understand git, and I feel like that can make a confusing history.