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

Repo Maintenance --> Setup Branch structure #11

Open
6 tasks
bosd opened this issue Mar 13, 2024 · 1 comment
Open
6 tasks

Repo Maintenance --> Setup Branch structure #11

bosd opened this issue Mar 13, 2024 · 1 comment

Comments

@bosd
Copy link

bosd commented Mar 13, 2024

In odoo repo's it is common to use a branch name similar to the odoo version.
E.g. 14.0, 15.0, 16.0, 17.0
For each version, we start with a fresh new branch.
Then per module a PR is created to migrate the code from the previous version to the next one.
14.0 --> 15.0
In the PR the complete commit history is preserved. And a migration commit is added on top.
eg

[add] base_monero
[MIG] base_monero: Migration to 15.0

We should follow this workflow here in this repo as well.

Tasks:

  • Delete main branch
  • Set 14.0 branch as the default
  • Delete the "dirty" 15.0 branch
  • Create new EMPTY 15.0 branch
  • Create new EMPTY 16.0 branch
  • Create new EMPTY 17.0 branch

@serhack @cryptochangements34 Can you take care of this?
Edit: If you give me the permissions, I'm also happy to do it.

new empty branch can be created with.

$ git checkout --orphan NEWBRANCH
$ git rm -rf .
@bosd
Copy link
Author

bosd commented Mar 14, 2024

cc: @tobiaskeute

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