Using Bitbucket

The version control utility can work with either Bitbucket or Git. You will need to work your support team to configure your repository.

Setup

The following organization structure is used by Orbita in Bitbucket.

• Workspace (Orbita-CS)

  • Project (Customer Name)

    • Repository (Project Name)

      • Branch (main, dev, stage, prod)

• Example

Open

Pull Request

When using the version control utility page, code checkins should go into the “dev” branch. This is the branch we will use to capture all the work done in the development project.

We deploy from the “main” branch to stage and production. To get your “dev” branch code into the “main” branch, you will need to do a “pull request”.

• Click “Pull Request” in the left menu to enter the “Pull Requests” section.

• Click “Create pull request” button.

• This will fill in the details of the code available for a pull request

Open

• You will want to make sure the “Source Branch” is populated with the correct branch. This should be “dev” unless configured differently.

• Once on this screen, click the “Create pull request” button.

•  

This will now create an “open” pull request that is waiting to be approved and merged

• Click the “Approve” button

• Click the “Merge” button

You can now go back to version control utility page and deploy the main branch to stage and/or production environments.