Branching Model
Trunk Based Development
Trunk Based Development (TBD) is a source-control branching model where developers work on a single branch called 'trunk', create short-lived feature branches, and merge their changes back to the trunk as soon as possible. Here are some benefits of using Trunk Based Development:
-
Reduced Integration Issues: Since developers are frequently merging their code back to the trunk, integration issues are identified and resolved quickly.
-
Faster Release Cycles: With TBD, you can release software faster and more frequently because the code in the trunk is always in a releasable state.
-
Improved Code Quality: Frequent integrations can help to improve code quality as issues are identified and fixed early.
-
Simplified Branching Model: TBD simplifies the development process by minimizing the number of branches that need to be managed.
-
Better Collaboration: It encourages better collaboration among developers as they are all working and integrating their changes on a single branch.
-
Continuous Integration and Continuous Delivery (CI/CD): TBD is a key enabler of CI/CD practices, which aim to automate the software delivery process.
Additional info: https://trunkbaseddevelopment.com/
Creating a Feature Branch
TODO
- Branch from main (no restrictions on the branch name)
- Commits don't need to follow any convention
- When creating the PR, follow convential commits definition. This is important because the PR will be squash merged into main and the commit message will be used to generate the github release.
Stacked Diffs
TODO