in the projects i work in i always try to force semi linear history to avoid all of this, never merge (unless it’s the MR) always rebase.

this leaves a very readable history, with each feature branch highlighted and no mixture in the commits…

i haven’t found any downside yet… maybe that some ci/cd are built to push to main, but making them do branch pr automerge is not that difficult