Or don't go crazy making branches in the first place.

Have a merge workflow which deletes the branch right there.