When doing a code change in a branch being NOT the dev branch, one must use the cherry pick system in order to align all branches prior to the one fixing.

This is the procedure:

When doing a bugfix there are two approaches that can be used, the one chosen depends on if the developer would like to implement the change in the needed place first, or follow the normal flow from the feature implementation.

Normal flow from feature implementation

  1. Create bugfix branch based on Dev branch
  2. Develop the implementation in the bugfix branch
  3. Create and complete PR from bugfix branch to Dev branch
  4. Cherry pick the changes from the Dev branch to Test Branch, and forward if needed.

Flow for target implementation.

  1. Create bugfix branch based on Test branch (or staging if that is the origin of the bug)
  2. Develop the implementation in the bugfix branch
  3. Create and complete PR from bugfix branch to Test branch
  4. Cherry pick the changes from Test branch to Dev branch (Or all prior branches)
  • No labels