Skip to content

Commit b9e36fc

Browse files
author
Donna-Marie Smith
committed
Modified following initial review
1 parent 8bde139 commit b9e36fc

File tree

5 files changed

+3
-10
lines changed

5 files changed

+3
-10
lines changed

content/en/docs/2025.3/Guides/cortex-gateway/settings/version-control.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ Only flows with Edit permissions for the current user are displayed in the Versi
2121

2222
### Get Master
2323

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.
24+
Any flows that have been committed to the Master Repository by another user are indicated by a downward pointing arrow {{< image src="/images/Version Control - Master Updated.png" >}}. 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.
2525

2626
See the [Use Version Control][Use Version Control tutorial] tutorial for a step-by-step guide.
2727

2828
### Commit Changes
2929

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.
30+
Any flows in the user’s repository that have uncommitted changes are indicated by an upward pointing arrow {{< image src="/images/Version Control - Uncommitted Changes.png" >}}. 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.
3131

3232
See the [Use Version Control][Use Version Control tutorial] tutorial for a step-by-step guide.
3333

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: "Shows how to use Version Control feature."
4+
description: "This section includes tutorials about how to use Version Control."
55
weight: 150
66
---
77

422 Bytes
Loading
445 Bytes
Loading

0 commit comments

Comments
 (0)