Note, this is a Standard Enterprise feature.
Concurrent Working allows users to work in parallel branches without having to lock a project. Changes made in any branch can be compared before merging to main and synchronized with any new updates that happen meanwhile.
See below for details on the following features
Setup Concurrent Working
Create branch
Project sharing at the branch level
Maintaining branches
See the overview of the feature here or review the step-by-step instructions below.
Enable Concurrent Working
Navigate to Dashboard
Select the 3 dots for the Project you want to enable concurrent working enabled
Select the Logo > Project Team
Enable Concurrent working toggle
Easy invitation - leave this enabled to allow collaborators to invite other team members to the project. Disabling this feature means that only the project owner can add collaborators.
Note:The project must be unlocked for the concurrent working mode to be enabled
The following popup will appear
Select Confirm to enable Concurrent Working. The toggle should now be blue to indicate it is enabled
Select the left arrow to navigate back
Expand arrow will appear beside the project
Main branch is created for the project and selected automatically
Create branch
Select Main branch
Select the highlighted icon to create a new branch
A popup will appear
Project sharing at the branch level
Select a branch within the project of your choice
Select the logo > Click on Project Team
You will now see a page with all the users that currently have access to the selected branch. Click Add Team Member and select the users you wish to add.
Merging branches
To begin the merge process, open the Concurrent Working many and select "Merge to Main"
Popup will appear, allowing you to review DDL and non-DDL changes.
Review SQL objects on the first tab. Note the DDL/non-DDL toggle on the bottom right.
UI Change: you will see that the DDL and NoDDL no longer show on the right side anymore. It appears on the left side
This view will show you all the SQL object changes you have made. On the right side is the Main branch side, and you will see checkboxes. Those boxes will allow you to specify which objects you want to push to the Main from the current branch.
Click "Apply and go next" to review project-level object changes
Click "Apply and go next" to review diagram changes
Note: New Enhancement
Diagrams can be selected when merging. The user can now choose which diagrams they wish to merge.Apply and merge apply the changes to the main branch.
Synchronize with the latest changes from the main
Modelers will see a blue indicator for Updates from the Main
Click on the icon and then select ‘Update from Main” or click the “Update” button to pull changes from the main
Popup will appear, allowing you to review DDL and non-DDL changes.
Review SQL objects on the first tab. Note the DDL/non-DDL toggle on the bottom right.
To exclude objects from the merge to main, uncheck them here.
Click "Apply and go next" to review project-level object changes.
Click "Apply and go next" to review diagram changes
Apply and merge apply the changes to the current branch.
Managing branches
From the Branches screen
To manage Concurrent Working projects and their branches, click on the three-dot menu next to any project in the dashboard and select "Branches."
The Branches screen offers the following options:
Open the revision for viewing/editing.
Review branch revisions.
Merge a revision to the Main branch.
Delete a revision.
From the Dashboard
Direct access to project branches is also available from the account dashboard by expanding the dropdown on a concurrent project.
Note that quick access for deleting a (non-Main) branch is available from the three-dot menu.
See also: