You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: CONTRIBUTING.md
+10-24Lines changed: 10 additions & 24 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -8,31 +8,17 @@ We try to collect all improvements and bug reports as Issues. Also we avoid push
8
8
9
9
## Workflow
10
10
11
-
We follow the [GitFlow Workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow).
12
-
13
-
## Standard workflow
14
-
15
-
If you want to add a new feature or fix a bug
11
+
If you want to add a new feature or fix a bug:
16
12
17
13
1. Fork the repository
18
-
2. Check out the **develop** branch `git checkout develop`
19
-
3. Create a new feature or bugfix branch `git checkout -b feature-upgrade-nodejes` (prefix with **feature**- or **bugfix**- and name it with something meaningful)
20
-
4. Create and push your commits into your own repository
21
-
5. Create a new Pull Request for your branch pointing to **develop**. Don't point it to **master** directly.
22
-
23
-
When enough features come together we will merge develop into master, create a new tag and publish it as a new release. With this approach the master will always contain the latest stable version.
24
-
25
-
## Hotfixes
26
-
27
-
If something critical needs to be fixed and released please
28
-
29
-
1. Create a hotfix branch (prefix with hotfix- and name it properly) based on the current master
30
-
2. Fix the code
31
-
3. Create a new Pull Request from your hotfix branch pointing it to **master**
32
-
4. Once it got reviewed and merged we will merge master back into develop to make sure it's in sync.
33
-
34
-
## Unstable releases
14
+
2. Check out the latest **master** branch `git checkout master && git pull`
15
+
3. Create a new feature or bugfix branch `git checkout -b feat-add-postgres18` (prefix with **feat**- or **fix**- and name it with something meaningful)
16
+
4. Create a commit with a [conventional commit message](https://www.conventionalcommits.org), for example: "feat: Add Postgres 18 container" or "fix: Remove usage of deprecated PHP constant"
17
+
5. Push your commits into your own repository
18
+
6. Create a new Pull Request for your branch pointing to **master**.
35
19
36
-
We might release unstable versions. Those will be tagged on develop and released clearly marked as unstable releases.
20
+
When the pull request has been approved and merged, then a release will automatically be made,
21
+
using [semantic versioning](https://semver.org/) based upon the conventional commit message in the merged pull request.
22
+
This will rebuild and push new versions of the containers.
0 commit comments