Versioning
Description
The Versioning tab in Orchestra Web Designer provides access to core Git operations within the workspace.
It displays the active branch and lists all tracked scenario elements under version control, organized into Unstaged Changes and Staged Changes.
Each entry includes the Scenario, Element, and Status, allowing users to review and manage modifications before committing. Users can create new elements, review changes, stage or unstage files, and synchronize updates with a remote repository.
All actions correspond directly to Git commands and operate on the repository defined in Git Setting, which must be configured with valid credentials before performing remote operations.
How It Works
Modified or newly created elements appear under Unstaged Changes, grouped by their corresponding scenario. Once added to the index, these elements appear under Staged Changes, ready to be committed.
Each entry shows the element name and current status, which may include:
- Modified — The element has been edited since the last commit.
- Untracked — A new element has been created locally and is not yet staged.
- Added — The element has been staged and is ready to be committed.
- Conflicting — The element contains merge conflicts that must be resolved manually.
- Changed — The element’s content or metadata has been updated since the last synchronization.
Users can review these changes, stage or unstage specific elements, and prepare commits directly within the tab.
Each row includes inline controls for element-level actions:
- + — Add to index; stages the element. (add icon)
- – — Remove from index; unstages the element. (add icon)
- >> — Add all to index; stages all modified elements. (add icon)
- << — Remove all from index; unstages all elements. (add icon)
- File link — Opens a plain-text view of the element’s content.
Once elements are staged, users can enter a Commit Message and push the commit.
In addition to staging and committing changes, other synchronization actions are available from the toolbar.
| Action | Description |
|---|---|
| Manage File | Users can create new files or folders, or modify existing ones. |
| Fetch | Retrieves updates from the remote repository without merging them. |
| Pull | Merges remote changes into the active branch. |
| Reset | Reverts local changes or branch state to a specific commit. |
| Commit | Creates a new commit containing staged changes. Requires a commit message. |
| Push | Publishes local commits to the remote repository. |
Conflict Handling
Conflicts may occur during Pull or Merge operations and are surfaced directly in the Versioning tab.
Users can resolve them manually using the inline controls:
- R to open the conflict resolver, or
- < / > to choose which version to keep.
Conflicted elements remain visible until resolved and committed.