Branches

Main Branches

At the current stage we are working for we have:

• A given version deployed in production.
• A version under development that will deployed to production once is ready.

We need to:

• Be able to introduce hotfixes on the current version.
• Develop on the new version without colliding the current version.

We will use two branches:

• Current version in production (right now 0.1) will be stored in main branch.
• Next version in development (0.9) will be stored in vnext branch.

Approach to follow:

• I need a hotfix on version 0.1, create a branch from version main and start working on that, once done PR from your branch against branch.

• I need to develop on next version (0.9), create a branch from version next and start working on that, once done PR from your branch against vnext.

• I want to deploy the new version, we will make a PR from vnext to `main``

• If you introduce changes on main, you will need to update vnext, merge main latest changs into vnext.

Feature Branches

If you are going to work on a new issue, create a branch with the following convention:

feature/#githubissueid-title-of-issue

Fixes Branches

If you are going to work on a bug fix, create a branch with the following convention:

fiox/#githubissueid-title-of-issue