On a project I worked on, there were a few fans of rebase who liked rebasing long-lived branches on top of trunk a lot. They also used to think that resolving c

On a project I worked on, there were a few fans of rebase who liked rebasing long-lived branches on top of trunk a lot. They also used to think that resolving conflicts was very simple and clear-cut. And it had indeed been so simple for them that when they finally merged their work into trunk, several bugfixes that had been released a while before the merge, just disappeared. When the users had reported that some old bugs reappeared, it took me some time to first confirm that I wasn’t going senile and that those bugs had been fixed before, then I couldn’t find the code I had put in, then I recreated some old PRs by hand and reapplied them. I don’t know what went wrong then and who was the idiot, and I think that my life is too short to find out exactly how it may have happened, but no commit has vanished since a blanket ban on rebasing and force-pushing.