ducaale/xh

Consider getting rid of `develop` branch

ducaale opened this issue · 1 comments

Reasons for keeping master branch only:

  • New contributors tend to branch off from the default branch (i.e master) for their PRs. This is understandable since most OSS projects don't use develop branch anymore.
  • There have been several occasions where I accidentally merged a PR directly to master instead of develop.
  • Since PRs are not immediately merged to master, related issues keep lingering until a release is made.
  • Whenever Clippy introduces new warnings, we need to fix both master (to make the nightly CI happy) and develop.
  • Having both master and develop branches complicates the release process.

Granted, there are ways to get around these issues (i.e have develop as the default branch, create contributing.md, and run nightly CI on develop instead of master), but I wonder if it is worth it the complexity of maintaining both branches?

Note that develop was originally introduced to allow cutting hotfix releases from master when needed. However, we are tagging each release so we should be able to branch off from the latest tag. See ignite/cli#2930 (comment):

When we need to patch a release, we create a release branch on the related tag (for instance release/v0.24.x on v0.24.0 tag). The PR that contains the patch is based on this release branch. Once the PR is merged, a patch tag is created (v0.24.1) on the release branch, and the new binaries are built from there.

The develop branch has been removed now