Resolve conflicts when merging changes from multiple sources of the same activity

Resolve conflicts when merging changes from multiple sources of the same activity by using the Source Control option in RPA Desktop Design Studio.

始める前に

If you're not connected to a ServiceNow instance, click the Connection Manager icon under the Design tab to connect to an existing instance. For more information, see Set up RPA Desktop Design Studio.

Create an activity. For more information, see Create and use an activity in RPA Desktop Design Studio.

Role required: none

手順

1. Open the project that has the activity that you want to resolve conflicts in.
2. In the Project Explorer pane, navigate to Activities.
3. Right-click the activity and select Source Control.
4. In the COMPARE PROCESSES dialog box, under the Remote section, select any of the following source types to open the automation project from the Source field.

   Option	Action
   Remote	Click the Open Project icon (). In the Open Project dialog box, select a package name and a version. Click Open. Click Save to save the Project in the default location. From the Select a Document version list, select a package version.
   Local	Click Browse. In the Open dialog box, select a project. Click Open.

   The changes are highlighted in the COMPARE PROCESSES dialog box as shown in the following example. If changes are added, they appear in green. If the changes are removed, they appear in red. If the changes are modified, they appear in yellow.

   図 : 1. Changes highlighted in the Compare Processes dialog box

   

5. Under the Local section, select any of the following options for resolving conflicts from the In conflict field:
   • Select Keep current items to retain the changes in the Local section.
   • Select Replace to replace the highlighted changes in the Local section with the highlighted changes in the Remote section.
6. In the CONFIRM dialog box, click OK.
7. Click Merge with current.