Skip to content

Feature/add version control documentation #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 64 commits into from
Apr 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
711090f
Created initial 2025.1 Doc
cortex-lp Dec 10, 2024
98ced0a
Updated CIP deployment document to include deployment of web.config w…
cortex-sr Dec 10, 2024
e6e0e97
Merge pull request #187 from CortexIntelligentAutomation/feature/2426…
cortex-sr Dec 11, 2024
ea5c5ec
Feature/32544 simplify installation process and unblock required inst…
Cortex-DMS Jan 22, 2025
0f91ecd
Feature/create 2024.11 to 2025.1 upgrade guide (#189)
Cortex-DMS Jan 29, 2025
2dd7608
Initial structure for new documentation
Feb 6, 2025
4cb3b95
Merge branch 'main' of https://github.com/CortexIntelligentAutomation…
Feb 24, 2025
6800b3a
Merge branch 'main' of https://github.com/CortexIntelligentAutomation…
Feb 24, 2025
b7fde8e
Added initial content for Package Management
Feb 27, 2025
0bbf8db
modified links
Feb 27, 2025
5acfdee
Changes following 2nd PO review
Mar 3, 2025
5428334
modifications following 2nd PO Review
Mar 3, 2025
c955db4
Moved Upgrade Guides into new structure from 2025.1
Mar 3, 2025
2fb3fe4
Further refinements and removal of old tutorials that are being replaced
Mar 3, 2025
39df133
Modified screen shots for consistency
Mar 5, 2025
bc32a11
Added initial Operations Overview documentation
Mar 5, 2025
2d6ce20
Added Links
Mar 5, 2025
feddfde
Modified image labels
Mar 5, 2025
422cd5d
added title to Package Management Tutorials
Mar 5, 2025
59c52e8
added initial anatomy for What is a Package?
Mar 5, 2025
07aebc0
Merge branch 'feature/new-documentation-structure-for-guides' of http…
Mar 5, 2025
461241f
added initial structure
Mar 5, 2025
f62cd9d
added initial content for studio import and export
Mar 5, 2025
de213e6
Modified content
Mar 6, 2025
7f2fc00
Made images clearer
Mar 6, 2025
8ae1dbd
Merge branch 'feature/new-documentation-structure-for-guides' of http…
Mar 6, 2025
d201696
Resized Image
Mar 6, 2025
ba377e7
Merge branch 'feature/add-operations-overview-documentation' of https…
Mar 6, 2025
d02a994
Resized images
Mar 6, 2025
ff46af4
Made changes to Version Control Content
Mar 6, 2025
871bfbd
Created 2025.3 Release Branch
Mar 18, 2025
9d6db87
Updated Supported Versions
Mar 18, 2025
fc32114
Merge branch 'main' of https://github.com/CortexIntelligentAutomation…
Mar 19, 2025
1539bea
Merge branch '2025.3' of https://github.com/CortexIntelligentAutomati…
Mar 19, 2025
878a977
Moved into 2025.3
Mar 19, 2025
796dbec
Excluded .Net download link from HTML Check due to 403 errors
Mar 19, 2025
77b2822
Excluded 2024.1 from HTML check
Mar 19, 2025
9d6a23d
Merge branch 'main' of https://github.com/CortexIntelligentAutomation…
Mar 19, 2025
2323ab2
Merge branch 'feature/add-operations-overview-documentation' of https…
Mar 19, 2025
da8d4d3
Moved into 2025.3
Mar 19, 2025
cb69803
Merged urls.toml
Mar 19, 2025
7e37bac
excluded external Scribe link from HTML test
Mar 19, 2025
c4243a1
Merge branch 'main' of https://github.com/CortexIntelligentAutomation…
Mar 19, 2025
44c8b6c
Merge branch '2025.3' of https://github.com/CortexIntelligentAutomati…
Mar 19, 2025
780b2a0
fixed incorrectly merged urls.toml
Mar 19, 2025
8c2b6d3
Merge branch 'feature/add-studio-import-export-documentation' of http…
Mar 19, 2025
ed67e6c
Moved to 2025.3
Mar 19, 2025
052819b
Updated structure of Studio Import
Mar 26, 2025
685eeba
Reformatted structure
Mar 26, 2025
e055c82
Modified following review
Mar 31, 2025
56e30f0
Added initial import client certificate FAQ
Mar 31, 2025
bce62f4
Merge branch 'feature/add-operations-overview-documentation' of https…
Mar 31, 2025
a71af37
altered ordering
Mar 31, 2025
aa803c5
Reviewed with PO
Apr 1, 2025
f9b12f8
Merge branch 'feature/add-studio-import-export-documentation' of http…
Apr 1, 2025
fef6336
restructured
Apr 1, 2025
8eff3d4
Updated Version Control following PO review and behaviour verification
Apr 1, 2025
0db38b7
Merge branch 'main' of https://github.com/CortexIntelligentAutomation…
Apr 24, 2025
52dffae
Fixed merge issues
Apr 24, 2025
71756fb
fixed incorrect merge of urls
Apr 24, 2025
b2e1579
fixed final urls merge issue
Apr 24, 2025
8bde139
updated urls.toml
Apr 24, 2025
b9e36fc
Modified following initial review
Apr 24, 2025
edfbbf8
modified following PO review
Apr 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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" >}}
Original file line number Diff line number Diff line change
@@ -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
---

Expand Down
12 changes: 12 additions & 0 deletions content/en/docs/2025.3/Tutorials/Administration/version-control.md
Original file line number Diff line number Diff line change
@@ -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" >}}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/static/2025.3/images/Version Control.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions data/urls.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down