...
Remember that for each diagram, it is possible to specify a default repository, branch, and file via the diagram settings.
After pressing “Push” in the dialogue, the following steps are taken automatically:
A new, temporary branch named <selected branch>-BPMN-model-update is created
The changes are pushed to this temporary branch
A merge request is created to merge the temporary branch in the one that was selected in the dialogue (develop in the screenshot provided above).
If the merge request is acceptable, it is automatically accepted, and the temporary branch is deleted.
If the Merge Request is not automatically acceptable (due to running pipelines, or a merge conflict, …) a manual merge is required. In this case, you receive the following message that leads to the merge request.
Troubleshooting
You may come across the following messages:
If you encounter the message that the VCS is not yet configured, ask your Confluence administrator to establish a connection between the app and your VCS in the app configuration. While this is not yet done, you will see a message like this when opening the Import from VCS dialog. An article for admins on how to establish a connection can be found in this manual here: [BPMN Modeler] Features for Confluence Admins.
After configuring the VCS connection globally, you will be prompted to authenticate your own VCS account as shown in the below screenshot. You will need to follow the provided link, log into your VCS account, and allow the OAuth App created by your Admin access to your repositories. Once authenticated, you can load files directly from the VCS and access only those projects and files for which you have permission and granted access.
