Project version control

Use version control to track project changes. Workspace changes are saved automatically and you can commit them to the project history.

To share committed changes with your peers, you must push them to the remote repository (see Push changes to the remote project).

If someone pushes changes to the remote repository while you have local changes in your workspace, you must pull those remote changes into your workspace before you can push (see Pull changes from the remote repository).

If there are conflicts between your changes and what is in the remote repository, the

Merge conflict

dialog appears. The dialog lists the files containing conflicts, the number of unresolved conflicts in each file, and the total number of unresolved conflicts.

Use the

Merge conflict

dialog to choose how to resolve conflicts. Choose one of these options to resolve a conflict:

Accept local changes
. Accepting local changes keeps the changes you made in your local workspace and deletes those coming from the remote repository.
Accept remote changes
. Accepting remote changes keeps those coming from the remote repository and deletes the changes made in your local workspace.
Accept both changes
. Accepting both changes merges changes from your local workspace and the remote repository.

Use the

Change history

tab on the Merge conflict dialog to see a record of all project changes. You can view the details of each commit, compare changes, and restore back to a previous version.

The project status appears in the lower right corner. The status indicates whether your project is synchronized with the remote repository.

After you complete a merge, you can push your changes to the remote repository. The commit, push, and pull actions in the toolbar enabled and indicate the number of commits available to push or pull.

Use these prompts with

FactoryTalk Design Studio®

Copilot and project version control.

Commit
Prompt
: Commit changes
FactoryTalk Design Studio Copilot response
: When prompted, enter a commit message that describe the changes. Once you enter a message, uncommitted changes commit.
FactoryTalk Design Studio
Copilot creates commit message.
Change history
reflects this commit.
Prompt
: Commit changes and create commit message.
FactoryTalk Design Studio Copilot response
:
FactoryTalk Design Studio
Copilot creates commit message.
Change history
reflects this commit
Prompt
: Explain the uncommitted changes.
FactoryTalk Design Studio Copilot response
:
FactoryTalk Design Studio
Copilot lists in the chat panel all the files with uncommitted changes but not the details.
Push
Prompt
: Push changes.
FactoryTalk Design Studio Copilot response
: If there are only locally committed changes and no uncommitted changes, the local committed changes push to the remote repository.
Change history
reflects this push.
Prompt
: Push changes.
FactoryTalk Design Studio Copilot response
: If there are only locally committed changes and uncommitted changes, only the local committed changes push to the remote repository.
Change history
reflects this push.
Prompt
: Push changes.
FactoryTalk Design Studio Copilot response
: If there are no locally committed changes,
FactoryTalk Design Studio
Copilot informs you that no locally committed change are available to push.
Prompt
: List any commits not yet pushed.
FactoryTalk Design Studio Copilot response
:
FactoryTalk Design Studio
Copilot lists in the chat panel commit messages and hashes but not the changes in detail.
Pull
Prompt
: Pull changes.
FactoryTalk Design Studio Copilot response
: As long as
Change history
is free of local commits or uncommitted changes, available remote repository commits pull to local workspace repository.
Change history
reflects this pull.
Prompt
: Pull changes.
FactoryTalk Design Studio Copilot response
: As long as
Change history
is NOT free of local commits or uncommitted changes,
FactoryTalk Design Studio
Copilot informs you that it cannot pull changes until you commit the local commits or uncommitted changes.
Prompt
: Pull changes.
FactoryTalk Design Studio Copilot response
: If there are merge conflicts, such as a local commit and remote commit both changing the same component,
FactoryTalk Design Studio
Copilot informs you to address the conflicts manually.
Prompt
: Are there any available remote commits?
FactoryTalk Design Studio Copilot response
: Either
Yes, there are available remote commits.
OR
No, there are no available remote commits.
.
Prompt
: List all available remote commits.
FactoryTalk Design Studio Copilot response
:
FactoryTalk Design Studio
Copilot lists in the chat panel commit messages but not the changes in detail.
Discard
Prompt
: Discard changes.
FactoryTalk Design Studio Copilot response
: If uncommitted changes are available, they are discarded. If no uncommitted changes are available,
FactoryTalk Design Studio
Copilot informs you that no uncommitted changes are available to discard.
Restore
Prompt
: Restore to latest commit.
FactoryTalk Design Studio Copilot response
: Last commit in the
Change history
restores.

Find information about

FactoryTalk Design Studio

Copilot prompts for:

Tasks
Program parameters