- Getting Started
- Setup and Configuration
- Automation Projects
- Dependencies
- Types of Workflows
- File Comparison
- Automation Best Practices
- Source Control Integration
- Debugging
- The Diagnostic Tool
- Workflow Analyzer
- ST-DBP-002 - High Arguments Count
- ST-DBP-003 - Empty Catch Block
- ST-DBP-007 - Multiple Flowchart Layers
- ST-DBP-020 - Undefined Output Properties
- ST-DBP-023 - Empty Workflow
- ST-DBP-024 - Persistence Activity Check
- ST-DBP-025 - Variables Serialization Prerequisite
- ST-DBP-026 - Delay Activity Usage
- ST-DBP-027 - Persistence Best Practice
- ST-DBP-028 - Arguments Serialization Prerequisite
- ST-USG-005 - Hardcoded Activity Arguments
- ST-USG-009 - Unused Variables
- ST-USG-010 - Unused Dependencies
- ST-USG-014 - Package Restrictions
- ST-USG-020 - Minimum Log Messages
- ST-USG-024 - Unused Saved for Later
- ST-USG-025 - Saved Value Misuse
- ST-USG-026 - Activity Restrictions
- ST-USG-027 - Required Packages
- ST-USG-028 - Restrict Invoke File Templates
- ST-USG-032 - Required Tags
- ST-USG-034 - Automation Hub URL
- Variables
- Imported Namespaces
- Coded automations
- Trigger-based Attended Automation
- UI Elements
- Selectors
- Object Repository
- Image and Text Automation
- Automating Citrix Technologies
- RDP Automation
- Salesforce Automation
- SAP Automation
- VMware Horizon Automation
- Logging
- The WebDriver Protocol
- Test Suite - Studio
- Extensions
- SetupExtensions tool
- Extension for Citrix
- Extension for Microsoft Remote Desktop and Apps
- Excel Add-in
- Troubleshooting
![](https://docs.uipath.com/_next/static/media/grid.05ebd128.png?w=3840&q=100)
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.
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.
Option |
Description |
---|---|
Choose Left |
Select the left file representing the file in the remote repository to push. |
Choose Right |
Select the right file representing the file in the local repository to push. |
Save |
Click Save after choosing the left or right file. |
Cancel |
Cancel the operation and exit the Solve conflicts window. |
Previous |
Navigates to the previous change in the compared files. |
Next |
Navigates to the next change in the compared files. |
Collapse All |
Collapses all nodes in the
.xaml files.
|
Expand All |
Expands all nodes in the
.xaml files.
|