studio
2025.10
false
UiPath logo, featuring letters U and I in white

Studio user guide

Last updated Feb 18, 2026

Solving Conflicts

GIT integration with Studio comes with a feature for solving conflicts that may occur when performing the Rebase or Push command, found in the Commit Changes window.

Whenever Studio detects a conflict between the local file and the one found in the remote repository, the Solve conflicts window is displayed.

docs image

The window is similar to Workflow Diff, showing the differences between the Remote version of the file and the Local version.

The following table describes the options available in the Solve conflicts window.

OptionDescription
Choose LeftSelect the left file representing the file in the remote repository to push.
Choose RightSelect the right file representing the file in the local repository to push.
SaveClick Save after choosing the left or right file.
CancelCancel the operation and exit the Solve conflicts window.
PreviousNavigates to the previous change in the compared files.
NextNavigates to the next change in the compared files.
Collapse AllCollapses all nodes in the .xaml files.
Expand AllExpands all nodes in the .xaml files.

Was this page helpful?

Get The Help You Need
Learning RPA - Automation Courses
UiPath Community Forum
Uipath Logo
Trust and Security
© 2005-2026 UiPath. All rights reserved.