Doesn’t that mean you have to fix all the merge conflicts introduced by your commits on every rebase though?

Git has gotten pretty smart about that recently: once you resolve a conflict, if you get the same conflict again it automatically resolves it the same way. Works for both rebase and merge.

if you don't have a merge from main into the branch further down, then git only bothers you about the most recently introduced conflicts conflicts --- the ones you'd have to resolve anyhow, and it remembers how you've resolved those.

You'd have merge conflicts whether you merge or rebase.

rerere can help, but OP probably has their own workflow

It is helpful because women can be outside alone without male relatives. You realize that most women go around with personal drivers rather than male relatives.

Isn't the male relative's guardianship considered to pass to the 'servant' that accompanies them?