Skip to content

Commit df92ea1

Browse files
committed
Update CONTRIBUTING.md with GitHub flow branching strategy.
1 parent 4b7a170 commit df92ea1

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

CONTRIBUTING.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@ git commit --signoff
3131
Only pull requests from committers that can be verified as having signed the OCA
3232
are accepted.
3333

34+
## Branching strategy
35+
36+
Use GitHub flow branching strategy. With the GitHub flow, there are only 2 branches: main and feature.
37+
38+
1. Every change that is worked on is branched directly off of main into a feature branch.
39+
2. Once a feature is ready it is tested on the feature branch and the code is reviewed before being merged to main.
40+
41+
Hotfixes, bugfixes are treated the same as feature branches.
42+
3443
## Pull request process
3544

3645
1. Ensure there is an issue created to track and discuss the fix or enhancement

0 commit comments

Comments
 (0)