Never merge anything into main.
Always merge into develop instead.
There will be 4 types of branches:
main
develop
feature
hotfix
When creating a feature, you will use a feature branch. The name can be whatever you want. When you are done, you will merge it into develop.
If there is a bug after a release, you will create a hotfix branch. The name is hotfix-#. When you are done, you will merge it directly into main because it needs to be released as soon as possible.
When there is a release, then and only then, will you merge develop into main. develop can be viewed at https://mesure73l-develop.netlify.app and main can be viewed at https://mesure.x10.mx. Web servers will be created for feature and hotfix branches automatically when a pull request is created. In addition, after a hotfix, in addition to merging the hotfix into main, you will also merge the hotfix into develop to keep it up to date.
Issue Contents
Never merge anything into main. Always merge into develop instead. There will be 4 types of branches:
When creating a feature, you will use a feature branch. The name can be whatever you want. When you are done, you will merge it into
develop. If there is a bug after a release, you will create a hotfix branch. The name ishotfix-#. When you are done, you will merge it directly into main because it needs to be released as soon as possible. When there is a release, then and only then, will you mergedevelopintomain.developcan be viewed at https://mesure73l-develop.netlify.app andmaincan be viewed at https://mesure.x10.mx. Web servers will be created for feature and hotfix branches automatically when a pull request is created. In addition, after a hotfix, in addition to merging the hotfix into main, you will also merge the hotfix into develop to keep it up to date.