Repo has a couple of merge commits
Closed this issue · 1 comments
I'd forgotten that github defaulted to creating merge commits, so I accidentally merged a couple of PRs as merges. I've now changed the repo settings to not allow merge commits. I really don't like merge commits. Since I'm not aware of anyone else currently working on any PRs, I'm going to do the unthinkable and rewrite history to get rid of these merge commits.
I'm creating this issue to document it so that it's a little easier if someone is in fact working on a PR.
The old history with merges is now in the branch main-with-merges. Commit ea694e0 in main-with-merges is equivalent to a372a31 in main.
This is done. I've now turned on branch protection for main, which will prevent me from doing such horrible things in future. In the event that anyone did have an outstanding PR they were working on and needs help rebasing their work onto the new main, please do reach out.