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

DEV BRANCHES: Version control - Development - Code Merging #3270

Open
vncoelho opened this issue May 23, 2024 · 3 comments
Open

DEV BRANCHES: Version control - Development - Code Merging #3270

vncoelho opened this issue May 23, 2024 · 3 comments

Comments

@vncoelho
Copy link
Member

Now that all basic components are here in the neo-core, we depend in this repo in different ways.

Without proper UTs, Integration Tests and verification on neo-cli, we will often need hotfix on minor things after a MAJOR release.
In particular, things become too much complex when we need to add new feature or refactors and we still need minor fix on main branch.

In mind of minor fixes, or even major ones, I would like to highlight, at least, the following:

  • We are going to still have many problems during the development of future MAJOR VERSIONS without a proper branch control.

Perhaps some commits since 3.7.4 could had been merged in a kind of development branch, while any necessary minor fix would directly go to master.

We could let a PR open with a per-defined title -> DEVELOPMENT BRANCH: NEXT MAJOR 3.X.X

@cschuchardt88
Copy link
Member

cschuchardt88 commented May 24, 2024

Benefits of having Release Branch:

You need create a new branch for releases when it time. Not only setting the tag in master. But creating this branch.

  1. Will allow us to make any configurations.
  2. Will allow us to apply bug fixes.
  3. Easy to use and understand github workflow actions.
  4. Can be merged back to master. (if any hotfixes)
  5. Will allow us not to have releases in nuget. (like v3.7.0, v3.7.1, v3.7.2, v3.7.3, v3.7.4 to just get deleted)

Example branch names would be:

  • release/v3.8.0
  • release/v3.9.0
  • release/v3.10.0
  • release/v3.11.0

@vncoelho
Copy link
Member Author

Exactly, @cschuchardt88

@cschuchardt88
Copy link
Member

Perhaps some commits since 3.7.4 could had been merged in a kind of development branch, while any necessary minor fix would directly go to master.

Normally you have a development branch. Where each member has it own branch; branching off the development branch.

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

2 participants