How do you clean up branches while working with PR ?!

It’s a nightmare. For each “bug” or feture there is a pull request created. As far as I know you MUST create a branch.

It’s easy to clean up GitHub (I’m just deleting branch after accepting PR. Which actually doesn’t even delete it for X days or something).

But local branches. OMG. It takes me at least 10 min/week to clean up and some of our devs don’t bother. They literally have 50+ local branches.

How do you manage that ?

I’m just about to write a script which deletes every local branch except selected (Yep UI with list of branches). But seems like overkill.

Question: I completed a feature on separate branch. Since I'm not allowed to merge things on the master branch (only pm is allowed to) I open a pull request.

However, PM has decided that he will only accept PRs which can be automatically rebased & merged.

So now i opened my PR and PM says that GitHub complains that the branches cannot be automatically merged.

So I rebase the branch - push and tell him to try again. But the same issue - GitHub won't merge the PR. So I try again - rebase the feature branch onto master which runs me through the same rebase steps as on the last try. I successfully complete this one too and push. But still - GitHub won't swallow the PR.

Anybody an idea what could've went wrong here?