Resolve conflicts in ServiceNow Studio before applying remote or stashed changes. Conflicts occur when there are multiple change versions of the same application file: one set of changes in the remote or stashed version and another
set of changes in the local version.
Procédure
-
Navigate to .
-
In the file navigator, select the application you want to open.
-
Select App details to open the app in the canvas.
-
Pull from a repository or stash local changes.
If the system detects a conflict, the Resolve Conflicts modal appears.
-
Select an option to resolve the conflict.
| Option | Description |
|---|
| Select an action |
Option to apply or discard all stashed changes. |
| Manually merge changes |
Option to individually select which changes to apply. |
-
If you want to apply or discard all changes, select an Action.
| Option | Description |
|---|
| Take stashed changes |
Applies the application file version from the stashed changes. |
| Discard stashed changes |
Applies the application file version from the most recent pull from the repository. |
-
Select Apply Stashed Changes.
-
Select Close dialog.
-
If you want to merge the conflicting changes, select Manually Apply.
The ServiceNow AI Platform displays a list of the version differences by field.
-
Select the field values you want the merged application file to have.
-
Select Save Merge.