The branching strategy used for both Engine and Ops projects is Scaled Trunk-Based Development where we have a main branch called trunk and the developers work in feature branches that eventually are integrated to the trunk.
- feat: for adding, refactoring or removing a feature
- bugfix: for fixing a bug
- hotfix: for changing code with a temporary solution and/or without following the usual process(because an emergency)
- test: for testing purposes
Branch name structure: {branch-category}/{description-separated-with-dashes}
Commit naming convention:
Context categories for arc-clavis-engine repo:
Commit name structure: [{context}] ({issue number (optional)}) {commit-message}
For example: [service] Handle empty Popularity results
Note: if a change affects two of the context categories, you can separate them using a backslash (/), f.e. [core/service]