Git flow

This is how tasks are started, developed, tested and deployed to production.

Infrastructure migration tasks and git branches are prefixed with “infra”

Get a Jira task number

Get or create a Jira task. Each task has a prefix and number like ABC-123.

The task slug will depend on the project name and workspace name.

Create a new branch from master

If the task name is: ABC-123 Change user email field
Your git branch should be feature/ABC-123-change-user-email-field
Your git commits should be: “ABC-123: added a new field”
This will give use a historical perspective over when and what was changed in Git Blame when needed in the future.

Create a PR to Stage

Review your changes
Merge the changes to staging branch
Wait for the ci/cd to finish.
Test your changes on staging.
Once they work as expected, inform the BeMyBond team

Create a PR to Production

Once the changes have been approved by BeMyBond team, merge the changes to the master branch
Once the pipeline finishes, your changes will be visible on production.

Don’t merge staging into master. Only feature branches. Because there will situations where you work on multiple tasks and some tasks still need testing. So to not block yourself, only merge feature branches.