Git branching strategy for your Django project, with a focus on handling migration conflicts efficiently, with the primary goal to help maintain a well-organized and collaborative development process. Here's a recommended branching strategy for project 'zinfotrek' for Axind :
-
Main Branches:
-
master
: This is the primary branch that always reflects the production-ready code. Only merge stable and tested code into this branch. Avoid direct commits to this branch. -
staging
: This is the primary branch that always reflects the staging-ready code. Only merge stable and tested code into this branch. Avoid direct commits to this branch. This branch is used to make sure every user stories works as expected and testing edge cases.
-