Branch cleanup
- Dominant language
- Python
- Stars
- 8
- Forks
- 172
- Avg merge
- 14h 51m
- Merged PRs (30d)
- 180
Description
Using a blank issue for this since it's not a bug or a feature request.
### Problem
Omnia originally had 2 branches: `main` and `devel`. Currently, there are 30 different branches in the repo. Some of them are dead and could probably easily be pruned, others are active and I'm not sure why.
We really don't need to keep a lot of long-lived branches. We could even start merging everything into `main` and have only 1 active branch (especially when we move to break up the monorepo like @i3igpete discusses in #4847). But right now we have too many.
We need to take inventory of all of Omnia's current branches and decide what needs to stay (and why) and what can go. Anything that is stale and has no commits that haven't been merged back into `main` could go immediately.
There isn't any need for additional branches in the repo. Contributors should be following the [CONTRIBUTING](https://github.com/dell/omnia/blob/main/CONTRIBUTING.md) guidelines and develop in their own personal fork, not in a branch in the top-level repository.
### Proposal
#### Delete Stale Branches
If there are no objections, we should **_immediately eliminate_**:
- All `release-1.x` (or `release_1.x`) branches
- All `devel-1.x` branches
- The `devel` branch
This would get rid of the vast majority of branches and should have no impact on existing development in the `main` branch.
#### Merge Commits and Delete Active Branches other than `main`
After these branches are deleted, we need to discuss merging any remaining commits/deltas from active branches into `main` via PR. Once that is done, all branches other than `main` should be deleted.
Contributor guide
Assessment
This issue has not been assessed yet.