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 20 hours ago (1 children)

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 20 hours ago (1 children)

Is that what interactive rebase tools use?

I don't do CLI git

[–] GissaMittJobb@lemmy.ml 1 points 14 hours ago

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