838

Yeah learned this the hard way.

you are viewing a single comment's thread
view the rest of the comments
[-] Eiri@lemmy.ca 1 points 1 day ago

That's a good explanation of what it's supposed to do. That was how I understood it as well.

But anytime I've tried it, I've ended up with conflicts where there shouldn't be (like, I already solved that conflict when I merged earlier) and/or completely undesirable results in the end (for instance, some of my changes are just NOT in the result).

So I just gave up on the whole feature. Simpler to just merge the source branch into mine.

[-] GissaMittJobb@lemmy.ml 1 points 1 day ago

Depending on how structured your commits have been, it can either be very difficult to get a rebase through or a complete breeze. There are some features to make it easier - rerere being the main one I'm thinking about.

[-] Eiri@lemmy.ca 1 points 1 day ago

Is that what interactive rebase tools use?

I don't do CLI git

[-] GissaMittJobb@lemmy.ml 1 points 19 hours ago

You enable it using git config, after that it will apply to whatever frontend you're using.

this post was submitted on 06 Oct 2025
838 points (100.0% liked)

Programmer Humor

26799 readers
2021 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 2 years ago
MODERATORS