Version Control Workflows

See below for procedures to follow version control workflows while you design flows in the Flow Designer.

• Using the Lock-Edit-Unlock Workflow: You need to follow a lock-edit-unlock workflow to work with projects and other Flow Service files, such as function collections.
• Using the Copy-Modify-Merge Workflow: You can edit other files without locking them, using a copy-modify-merge workflow.
• Configuring Lock and Ignore Settings: Configure the file types that require a lock and ignore files from version control. You won't be able to execute version commands on files that match the file patterns you specify in the ignore list.

Using the Lock-Edit-Unlock Workflow

Locks are a mechanism that prevent users from overwriting each other's changes and losing work. When you lock a file, other users can't modify it until you release the lock. Committing your changes releases the lock.

Projects and other Flow Service files require a lock to edit. You can also require locks for other files, for example, graphics files and other files that can't be edited simultaneously.

See below to use the lock-edit-unlock workflow in the Flow Designer.

1. Update to the latest revision: You can select files and folders in the tree pane or file pane and click in the version control toolbar.
2. Lock the file: You can select files and click in the version control toolbar.
3. Modify the working copy.
4. Commit your changes: You can click in the version control toolbar.

Using the Copy-Modify-Merge Workflow

You can follow the copy-modify-merge workflow for non-Flow-Service files. In the copy-modify-merge workflow, multiple users can write to the same file. This can result in changes that conflict; you'll need to manually resolve the conflict.

See below to use the copy-modify-merge workflow in the Flow Designer:

1. Update to the latest revision: You can select files and folders and click in the version control toolbar.
2. Modify the working copy.
3. Commit your changes: You can select files and folders in the tree pane or file pane and click in the version control toolbar.

Conflicts can occur whenever you update. You can use the Flow Designer to resolve conflicts.

Configuring Lock and Ignore Settings

Configure the following settings in the version control settings for a Flow Service user. To configure the settings, in the management console, go to the Tools > Account page and in the Version Control section, click Edit.