Skip to content

Commit

Permalink
simplfy git flow, no dev branch anymore
Browse files Browse the repository at this point in the history
  • Loading branch information
hemidactylus committed Feb 17, 2024
1 parent 84a771f commit 4ccfd39
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,6 @@ poetry install -E all --with dev --with test_integration # or similar, this is
[Inspired from this](https://github.com/orgs/python-poetry/discussions/1135).
You also need a recent Poetry for this to work.

### Git flow

_Note: this is a rough guide, use your common sense and consider exceptions._

`main` is where versioned releases occur (the corresponding commits are git-tagged
as `v0.0.7` and similar, parallel to the PyPI releases).

Please do not push/PR more than trivial fixes directly to `main`.

Features should generally be done on specific branches and merged into `dev`
for wider testing. Then, with a slower cadence (such as, when releasing),
`dev` would be merged to `main`.

![Git flow](images/git-flow.png)

#### Versioning

We are still at `0.*`. Occasional breaking changes are to be expected,
Expand Down
Binary file removed images/git-flow.png
Binary file not shown.

0 comments on commit 4ccfd39

Please sign in to comment.