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

Consider getting rid of develop branch #291

Closed
ducaale opened this issue Nov 6, 2022 · 1 comment
Closed

Consider getting rid of develop branch #291

ducaale opened this issue Nov 6, 2022 · 1 comment

Comments

@ducaale
Copy link
Owner

ducaale commented Nov 6, 2022

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.

@ducaale ducaale pinned this issue Nov 7, 2022
@ducaale
Copy link
Owner Author

ducaale commented Nov 7, 2022

The develop branch has been removed now

@ducaale ducaale closed this as completed Nov 7, 2022
@ducaale ducaale unpinned this issue Dec 13, 2022
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