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.

Sign up for GitHub

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

Jump to bottom

Stop using develop branch ? #2326

Closed
PowerKiKi opened this issue Nov 16, 2022 · 2 comments
Closed

Stop using develop branch ? #2326

PowerKiKi opened this issue Nov 16, 2022 · 2 comments
Assignees
@PowerKiKi
Milestone
1.2.0

Comments

@PowerKiKi
Copy link
Member

@Progi1984, I'd like to suggest to entirely drop the develop branch, and instead have only a single long-lived branch master. All developments can happen in short-lived "feature branch". Since we extensively use PRs already this is already very natural, and only tested PR are merged into master. Then master can be released whenever it needs to.

Dropping develop has the advantage of reduce maintenance noise. When cutting a release, there is nothing to merge anymore, so there isn't any risk of conflicts or merge mistakes. I believe it is also easier for infrequent contributors, because they only have to worry about a single remote branch.

We've been working this way in PhpSpreadsheet for years now, and it was really an improvement for us.

I'll take care of the transition if you agree. What do you think ?
@Progi1984
Copy link
Member

@PowerKiKi Good idea 👍 I approve it.

@PowerKiKi PowerKiKi self-assigned this Nov 16, 2022
@Progi1984 Progi1984 added this to the v1.1.0 milestone Nov 16, 2022
@PowerKiKi
Copy link
Member Author

Fixed in d2c6b9f

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@PowerKiKi PowerKiKi

Labels
None yet
Milestone
1.2.0
Development

No branches or pull requests
2 participants
@PowerKiKi @Progi1984