Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlovetox <philipp@hoerist.com>2022-03-27 17:04:22 +0300
committerlovetox <philipp@hoerist.com>2022-03-27 17:04:22 +0300
commitbffb92182d38b974a9038db94e3822dba229000a (patch)
treea4eb521ef536d536e24b603a9286a0149322018b /CONTRIBUTING.md
parent93bd73bb04c1301d00437737d1654e5ed5f011fd (diff)
chore: Update CONTRIBUTING.md
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md26
1 files changed, 22 insertions, 4 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4d7cd732c..f7f95f5ad 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,10 +2,28 @@
If you want to create a fork and use an external account (Github, Google) drop us a message at the Gajim support [group chat](xmpp:gajim@conference.gajim.org?join) so we can give you the necessary rights
-- master - Development branch
-- gajim_1.1 - Stable Gajim 1.1.x branch
-- gajim_1.0 - Stable Gajim 1.0.x branch
-- gajim_0.16 - Stable Gajim 0.16.x branch
+## Versioning
+
+┌────── Major (Will not change unless we switch GTK version)
+│ ┌───── Minor (Changes when new features are introduced
+│ │ ┌─── Micro (Used for hotfixes and small changes)
+│ │ │ ┌─── Only used while developing
+│ │ │ │
+│ │ │ │
+│ │ │ │
+│ │ │ │
+1.3.3-dev1
+
+## Branches
+
+Currently there is only one stable/development branch - master.
+The master branch must always be in a releasable state.
+
+Development for bigger changes need to happen in feature branches or forks.
+
+Previously the project maintained multiple versions of Gajim in
+different stable branches, but from Gajim 1.4.0 on this approach was changed
+to lower the maintenance burden and release faster.
# Commit Messages