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

switch to Gitflow workflow for repo management #148

Closed
coolharsh55 opened this issue May 21, 2024 · 1 comment
Closed

switch to Gitflow workflow for repo management #148

coolharsh55 opened this issue May 21, 2024 · 1 comment
Assignees
@coolharsh55
Labels
code help-wanted review
Milestone
dpv v2.1

Comments

@coolharsh55
Copy link
Collaborator

Instead of directly making changes to main without a release, keep all developments in dev, and only merge in main when there is a release. For seeing live version of the dev branch, mirror it on dpvcg.org.
@coolharsh55 coolharsh55 added this to the dpv v2.1 milestone May 21, 2024
@coolharsh55 coolharsh55 self-assigned this May 21, 2024
coolharsh55 added a commit that referenced this issue Jul 13, 2024
@coolharsh55
set up 2.1-dev as the next release; closes #148
b4fc2d9 
- the workflow going ahead is to put the next release in 2.1-dev
- number can change in future e.g. as 3.0
- this allows ongoing efforts to be visible in the main branch
- and discussion changes to be put in dev branch (live at dev.dpvcg.org)
- the name is 2.1-dev instead of dev following best practices for
  semantic versioning - see https://semver.org/
@coolharsh55
Copy link
Collaborator Author

As confirmed in the last meeting (JUL-10), we will be continuing development of the next version in the main/master branch of the repo, but with a versioned folder. Instead of dev, the folder will be 2.1-dev instead of dev following best practices for semantic versioning - see https://semver.org/. If major versions are introduced, the number will change to 3.0.

The workflow going ahead is to update the 2.1-dev files in the dev branch for discussions that are not accepted yet, and to then move it to the main/master branch once we have some degree of acceptence. Stuff in the main/master branch can still change in future discussions.

@coolharsh55 coolharsh55 added review and removed todo labels Jul 13, 2024
@coolharsh55 coolharsh55 closed this as completed by moving to Done in dpv 2.1 planning Jul 16, 2024
coolharsh55 added a commit that referenced this issue Jul 21, 2024
@coolharsh55
set up 2.1-dev as the next release; closes #148
ed80840 
- the workflow going ahead is to put the next release in 2.1-dev
- number can change in future e.g. as 3.0
- this allows ongoing efforts to be visible in the main branch
- and discussion changes to be put in dev branch (live at dev.dpvcg.org)
- the name is 2.1-dev instead of dev following best practices for
  semantic versioning - see https://semver.org/
coolharsh55 added a commit that referenced this issue Jul 31, 2024
@coolharsh55
set up 2.1-dev as the next release; closes #148
e0c47ba 
- the workflow going ahead is to put the next release in 2.1-dev
- number can change in future e.g. as 3.0
- this allows ongoing efforts to be visible in the main branch
- and discussion changes to be put in dev branch (live at dev.dpvcg.org)
- the name is 2.1-dev instead of dev following best practices for
  semantic versioning - see https://semver.org/
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@coolharsh55 coolharsh55

Labels
code help-wanted review
Projects
None yet
Milestone
dpv v2.1
Development

No branches or pull requests
1 participant
@coolharsh55