diff --git a/content/en/docs/2025.3/Guides/cortex-gateway/settings/version-control.md b/content/en/docs/2025.3/Guides/cortex-gateway/settings/version-control.md deleted file mode 100644 index 7033dc287..000000000 --- a/content/en/docs/2025.3/Guides/cortex-gateway/settings/version-control.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: "Version Control" -linkTitle: "Version Control" -description: "High level view of flows out of sync with master. Allow for mass Commit or Get Master" ---- - -{{< workinprogress >}} diff --git a/content/en/docs/2025.3/Guides/user-guides/user-interfaces/gateway/Admin/version-control.md b/content/en/docs/2025.3/Guides/user-guides/user-interfaces/gateway/Admin/version-control.md new file mode 100644 index 000000000..72677249e --- /dev/null +++ b/content/en/docs/2025.3/Guides/user-guides/user-interfaces/gateway/Admin/version-control.md @@ -0,0 +1,50 @@ +--- +title: "Version Control" +linkTitle: "Version Control" +description: "View and manage differences between flows in the current user's repository and the Master Repository." +weight: 90 +--- + +# {{% param title %}} + +## Summary + +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. + +## Anatomy + +{{< figure src="/images/Version Control.png" title="Version Control" >}} + +Only flows with Edit permissions for the current user are displayed in the Version Control grid. + +## Actions + +### Get Master + +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. + +See the [Use Version Control][Use Version Control tutorial] tutorial for a step-by-step guide. + +### Commit Changes + +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. + +See the [Use Version Control][Use Version Control tutorial] tutorial for a step-by-step guide. + +## Remarks + +### Known Limitations + +* Parent groups must also have edit permissions, in addition to the flows, otherwise the group and flows contained within it will not be displayed. + +## See Also + +### Related Concepts + +None + +### Related Tutorials + +* [Use Version Control][Use Version Control tutorial] + +[Use Version Control tutorial]: {{< url path="Cortex.Tutorials.Administration.VersionControl.UseVersionControl" >}} diff --git a/content/en/docs/2025.3/Tutorials/Administration/package-management.md b/content/en/docs/2025.3/Tutorials/Administration/package-management.md index 0ab59d22e..dcd9e0cb1 100644 --- a/content/en/docs/2025.3/Tutorials/Administration/package-management.md +++ b/content/en/docs/2025.3/Tutorials/Administration/package-management.md @@ -1,7 +1,7 @@ --- title: "Package Management" linkTitle: "Package Management" -description: "This section includes tutorials about managing packages on the {{% ctx %}} platform." +description: "This section includes tutorials about creating and managing packages." weight: 200 --- diff --git a/content/en/docs/2025.3/Tutorials/Administration/version-control.md b/content/en/docs/2025.3/Tutorials/Administration/version-control.md new file mode 100644 index 000000000..a4aad3c81 --- /dev/null +++ b/content/en/docs/2025.3/Tutorials/Administration/version-control.md @@ -0,0 +1,12 @@ +--- +title: "Version Control" +linkTitle: "Version Control" +description: "This section includes tutorials about performing bulk version control operations including Get Master and Commit Changes." +weight: 150 +--- + +# {{% param title %}} + +## Use Version Control + +{{< scribe title="How_to_use_Version_Control_Management" id="DsyGmkx8QRynHP54ZRP0Ew" >}} diff --git a/content/static/2025.3/images/Version Control - Master Updated.png b/content/static/2025.3/images/Version Control - Master Updated.png new file mode 100644 index 000000000..a20f934bf Binary files /dev/null and b/content/static/2025.3/images/Version Control - Master Updated.png differ diff --git a/content/static/2025.3/images/Version Control - Uncommitted Changes.png b/content/static/2025.3/images/Version Control - Uncommitted Changes.png new file mode 100644 index 000000000..804d4d0ce Binary files /dev/null and b/content/static/2025.3/images/Version Control - Uncommitted Changes.png differ diff --git a/content/static/2025.3/images/Version Control.png b/content/static/2025.3/images/Version Control.png new file mode 100644 index 000000000..c332b946c Binary files /dev/null and b/content/static/2025.3/images/Version Control.png differ diff --git a/data/urls.toml b/data/urls.toml index 9c1024d33..15863b128 100644 --- a/data/urls.toml +++ b/data/urls.toml @@ -2786,6 +2786,9 @@ [Cortex.Tutorials.Administration.StudioExport] MainDoc = "/docs/tutorials/administration/studio-export" ExportIndividualFlows = "/docs/tutorials/administration/studio-export/#export-individual-flows" + [Cortex.Tutorials.Administration.VersionControl] + MainDoc = "/docs/tutorials/administration/version-control" + UseVersionControl = "/docs/tutorials/administration/version-control/#use-version-control" [Cortex.Tutorials.Operations] MainDoc = "/docs/tutorials/Operations" [Cortex.Tutorials.Operations.Overview]