Skip to content

Commit dabb35e

Browse files
committed
docs: improve the CONTRIBUTING
1 parent 8ecb2fd commit dabb35e

File tree

1 file changed

+31
-32
lines changed

1 file changed

+31
-32
lines changed

CONTRIBUTING.md

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,54 +11,53 @@
1111

1212
### Branching model
1313

14-
A Git branching model defines your [branching strategy](https://www.perforce.com/blog/vcs/best-branching-strategies-high-velocity-development) in Git. It determines when and how developers make changes and commit them back to your codebase.
14+
We follow a specific branching model to organize our development process. Please adhere to the following guidelines when creating branches:
1515

16-
Using a Git branching model can expedite the process of delivering feedback to developers. [Git hosting](https://www.perforce.com/git-hosting) solutions don’t come with a branching model out of the box. These Git branching models are branching patterns designed to help overcome challenges. But with Git, you have to build it!
16+
### **Main Branches**
1717

18-
### **Development branch**
18+
- **main**: The main branch is the production branch and represents the latest stable version of the project.
19+
- **dev**: The development branch where active development takes place.
1920

20-
Usually the integration branch for feature work and is often the default branch or a named branch. For pull request workflows, the branch where new feature branches are targeted.
21+
### **Feature branches**
2122

22-
- `dev`
23+
Feature branches should have one of the following prefixes: fix (bug fix), ft (feature), ht (hotfix), chore, or doc (documentation), followed by a forward slash and a descriptive name.
2324

24-
### **Production branch**
25+
**Examples:**
2526

26-
Used for deploying a release. Branches from, and merges back into, the development branch. In a Gitflow-based workflow it is used to prepare for a new production release.
27+
- ft/new-section-layout
28+
- fix/bug-fix
29+
- ht/emergency-fix
30+
- chore/update-dependencies
31+
- doc/update-readme
2732

28-
- `main`
33+
### Commit
2934

30-
### **Feature branch**
35+
- Adhere to the conventions outlined in [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) when crafting your commit messages.
36+
- Aim to produce mid-sized commits every couple of minutes or hours. However, prioritize logical consistency in your contributions. This entails breaking down extensive changes into multiple commits, ensuring each commit conveys an independent and meaningful purpose described in its commit message.
3137

32-
Used for specific feature work or improvements. Generally branches from, and merges back into, the development branch, using pull requests.
33-
They should have the following prefix `ft/`
38+
#### Examples
3439

35-
- `ft/{FEATURE_NAME}`
40+
1. **Following Conventional Commits:**
3641

37-
### **Hotfix branch**
42+
```bash
43+
git commit -m "feat: add new feature"
44+
git commit -m "fix: resolve issue with..."
45+
```
3846

39-
Used to quickly fix a Production branch without interrupting changes in the development branch. In a Gitflow-based workflow, changes are usually merged into the production and development branches.
40-
They should have the following prefix `ht/`
47+
2. **Logical Consistency:**
4148

42-
- `ht/{BUG_NAME}`
49+
- Break down changes logically.
4350

44-
### **Bugfix**
51+
```bash
52+
# Good practice
53+
git commit -m "chore: update dependencies"
54+
git commit -m "doc: improve documentation"
4555

46-
This branch is used to fix bugs which might be more intensive when it comes to the amount of changes to be done.
47-
They should start with the prefix `bg/`
56+
# Avoid combining unrelated changes
57+
git commit -m "chore: update dependencies and fix bug"
58+
```
4859

49-
- `bg/{BUG_NAME}`
50-
51-
### **Release**
52-
53-
Branch used for release tasks and long-term maintenance versions. They are branched from the development branch and then merged into the production branch.
54-
They should start with this prefix `rl/`
55-
56-
- `rl/{VERSION}`
57-
58-
### Commits
59-
60-
- Follow this guideline [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) for your commit messages
61-
- Try to create a mid-sized every couple of minutes/hours. But more importantly, try to let commits be logically consistent contributions. That means if you have many changes in lines of code you can split them up into multiple commits but each of those commits should have an independent meaning that is described by the commit message.
60+
By adhering to these guidelines, we maintain a clean and informative commit history. Please refer to the provided examples for a better understanding of the recommended practices.
6261

6362
### PRs, Code Review
6463

0 commit comments

Comments
 (0)