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

feat: Visualize branching and versioning #72

Merged
merged 1 commit into from
Aug 4, 2023
Merged

feat: Visualize branching and versioning #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 30 additions & 0 deletions .github/resources/app_branching_strategy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Groupware App Branching Strategy

This document gives an overview of how git branches and tags are used for Groupware apps.

## Versioning

All modifications go into `main` first. `main` is used for all pre-releases. At RC1, a *stable branch* is created from HEAD of `main`. `main` targets the next minor or major release after this branch-off. The stable branch is used to finalize the stabilization of the minor/major release. Once the first .0 version is out, all future patch releases are created from the stable branch directly. If there is a pre-release for a patch release, it's done on the stable branch directly (v5.8.2 below).

```mermaid
gitGraph
commit id: "v5.8.0-alpha1"
commit id: "v5.8.0-alpha2"
commit id: "v5.8.0-beta1"
commit id: "v5.8.0-beta2"
commit id: "v5.8.0-rc1"
branch stable5.8
checkout main
commit id: "v5.9.0-alpha1"
checkout stable5.8
commit id: "v5.8.0-rc2"
commit id: "v5.8.0"
checkout main
commit id: "v5.9.0-alpha2"
checkout stable5.8
commit id: "v5.8.1"
commit id: "v5.8.2-rc1"
commit id: "v5.8.2"
checkout main
commit id: "v5.9.0-beta1"
```