Skip to content

not all commits on main have to be tagged #138

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

Merged
merged 2 commits into from
Jun 9, 2023
Merged

not all commits on main have to be tagged #138

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
475d1bb
not all commits on main have to be tagged
Maximilian-Stefan-Ernst Jul 3, 2022
4b6e2a7
when to tag specifically
aaronpeikert Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions contributing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ We follow the Gitflow workflow described [here](https://www.atlassian.com/git/tu

### main
- contains the recent released version
- all commits are tagged

### devel
- contains all changes until a new minor/major release branche is created
Expand All @@ -53,6 +52,7 @@ We follow the Gitflow workflow described [here](https://www.atlassian.com/git/tu
- no new features (only bug fixes, documentation generation, etc.)
- is merged into main and tagged to create a new release
- also merged into devel when release is created
- trigger registrator after successfull and validated/tested merge into main

### feature/xxx:
- forked from devel to develop a new feature
Expand All @@ -61,13 +61,15 @@ We follow the Gitflow workflow described [here](https://www.atlassian.com/git/tu
### hotfix/xxx
- forked from main
- merged into main and devel (or the current release branch) and main is tagged
- trigger registrator after successfull and validated/tested merge into main


### documentation/xxx
- remember to add an apropriate tag if merged into main/release (e.g. v1.2.3+doc1 see [Documenter.jl docs](http://mortenpi.eu/Documenter.jl/dev/man/hosting/#Documentation-Versions))
- forked from main/release/devel merged into main/release/devel.
- **only** changes to documentation

### testing/xxx
### test/xxx
- changes that do not touch the code but only test
- **only** changes that fix faulty tests or increase test coverage
- forked from main/release/devel merged into main/release/devel
Expand Down