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

[BUG] develop-6.x.x is out of sync with 6.3.0 latest release #5549

Open
duncdrum opened this issue Nov 13, 2024 · 1 comment
Open

[BUG] develop-6.x.x is out of sync with 6.3.0 latest release #5549

duncdrum opened this issue Nov 13, 2024 · 1 comment
Labels
discuss ask for feedback
Milestone

Comments

@duncdrum
Copy link
Contributor

duncdrum commented Nov 13, 2024

According to the contribution notes the develop-6.x.x is the main branch for ongoing 6.x development.

6.3.0 was released from the 6.3.0-branch but we haven't merged back into develop-6.x.x If we want to have a continuous history it should be merge.

@duncdrum duncdrum added this to the eXist-6.3.1 milestone Nov 13, 2024
@duncdrum duncdrum added the discuss ask for feedback label Nov 13, 2024
@adamretter
Copy link
Contributor

adamretter commented Nov 14, 2024

It should not be merged back. As I previously explained to you here and here, if you do that, you will loose context and history and drop some commits. It is a very bad idea to do that!

The part of the Contributing to eXist-db document that you sited was written by me and my team. It does not mention release branches (e.g. 6.3.0-branch) at all intentionally. That document is designed for Contributors and not Release Managers, its guidance does not cover this situation. The use of release branches are an exceptional circumstance (as evidenced by the fact that there have only ever been 5 of them in 20 years).

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

No branches or pull requests

2 participants