Skip to content

Commit 8eff3d4

Browse files
author
Donna-Marie Smith
committed
Updated Version Control following PO review and behaviour verification
1 parent fef6336 commit 8eff3d4

File tree

5 files changed

+28
-10
lines changed

5 files changed

+28
-10
lines changed

content/en/docs/2025.3/Guides/user-guides/user-interfaces/gateway/Admin/version-control.md

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,48 @@
11
---
22
title: "Version Control"
33
linkTitle: "Version Control"
4-
description: "This section includes user guides related to Version Control in {{% ctx %}} Gateway."
4+
description: "Displays the flow hierarchy for the current user indicating whether the flows are the same as or differ from the Master Repository."
55
weight: 90
66
---
77

88
# {{% param title %}}
99

1010
## Summary
1111

12-
The Version Control feature displays the Group hierarchy of the flows for the current user, identifying whether the current user’s flows, stored in the user’s sandbox repository, are up to date with the Master Versions, stored in the Master Repository.
13-
14-
| | |
15-
|------------------------------|-----------------------------------------------------------------|
16-
| **Roles Required:** | Admin |
12+
The Version Control page displays the flow hierarchy for the current user, indicating whether the current user’s flows, stored in the user’s repository, are the same as or differ from the Master Versions, stored in the Master Repository.
1713

1814
## Anatomy
1915

2016
{{< figure src="/images/Version Control.png" title="Version Control" >}}
2117

2218
Only flows with Edit permissions for the current user are displayed in the Version Control grid.
2319

24-
Any flow versions, in the user’s repository, that are ahead of the Master Version, in the Master Repository, are indicated by an upward pointing arrow, and may be selected to be Committed as the Master Version by using the `Commit Changes` button.
20+
## Actions
21+
22+
### Get Master
23+
24+
Any flows that have been committed to the Master Repository by another user are indicated by a downward pointing arrow [Add image here]. These newer Master Versions may be pulled into the user’s repository by selecting them and clicking the `Get Master` button; if `Get Master` is selected for a flow that also has user uncommitted changes, these changes will be lost and the flow will be overwritten with the Master Version from the Master Repository.
25+
26+
See the [Use Version Control][Use Version Control tutorial] tutorial for a step-by-step guide.
27+
28+
### Commit Changes
29+
30+
Any flows in the user’s repository that have uncommitted changes are indicated by an upward pointing arrow [Add image here]. These flows may be committed to the Master Repository by selecting them and clicking the `Commit Changes` button; if any flows selected to be committed have a new Master Version committed by another user a dialog will be displayed prompting conflicts to be resolved by taking either the version to be committed (`Take your version`) or `Take master version` resulting in a `Get Master` being performed.
2531

26-
Any flow Master Versions that have been Committed to the Master Repository by another user are indicated by a downward pointing arrow, and may be selected to be retrieved from the Master Repository and stored in the user’s repository using the `Get Master` button.
32+
See the [Use Version Control][Use Version Control tutorial] tutorial for a step-by-step guide.
2733

2834
## Remarks
2935

3036
### Known Limitations
3137

38+
* There is no prompt to resolve conflicts when getting the Master Version of a flow that has uncommitted user changes.
3239
* It is necessary for the parent groups to have edit permissions in addition to the flows, to enable the display of the flows in Version Control.
3340

3441
## See Also
3542

3643
### Related Concepts
3744

38-
TODO
45+
None
3946

4047
### Related Tutorials
4148

content/en/docs/2025.3/Tutorials/Administration/studio-import.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,8 @@ weight: 50
1010
## Import Individual Flows
1111

1212
{{< scribe title="How_to_use_Studio_Import_to_Import_Individual_Flows" id="kNzevcaURRexdsZKtpg_Ew" >}}
13+
14+
## Test 1
15+
16+
{{< scribe title="How_to_use_Studio_Import_to_Import_Individual_Flows" id="kNzevcaURRexdsZKtpg_Ew" >}}
17+

content/en/docs/2025.3/Tutorials/Administration/version-control.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Version Control"
33
linkTitle: "Version Control"
4-
description: "This section includes tutorials about using Version Control."
4+
description: "Shows how to use Version Control feature."
55
weight: 150
66
---
77

5.78 KB
Loading

layouts/partials/toc.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{{ partial "page-meta-links.html" . }}
2+
{{ if not .Params.notoc }}
3+
{{ with .TableOfContents }}
4+
{{ . }}
5+
{{ end }}
6+
{{ end }}

0 commit comments

Comments
 (0)