Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganize branches #1

Open
MrSimbax opened this issue Sep 4, 2021 · 0 comments
Open

Reorganize branches #1

MrSimbax opened this issue Sep 4, 2021 · 0 comments

Comments

@MrSimbax
Copy link

MrSimbax commented Sep 4, 2021

  • a new stable branch will have the same role as the old master branch
  • a new main branch will have the same role as the old dev branch
  • the main branch will be the default repository branch
  • the dev- branches will contain big features to which multiple people can contribute at the same time, which means force pushes are not allowed to them
  • the wip- branches will be personal branches, they can be forced pushed so the single person working on the branch can push whatever they want there and not care about commit messages, their content etc. as long as the history is cleaned up before opening a pull request to one of the other branches
  • the fix- branches are for hot fixes and can only be based on main or stable branch
  • other branch prefixes will be considered on a case-by-case basis, for example diversity- for a feature mainly for a competition named Diversity
  • the master and dev branches shall remain frozen for the next 2 releases, in order to give time for everyone to update their local repositories and forks; after this period the branches will be deleted

Note: Besides settings on GitHub, scripts for CI and tools like release.py will also have to be updated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant