Legacy - Resolve conflicts

Application developers can choose which application file version to use when applying remote or stashed changes.

시작하기 전에

중요사항:

Starting with the Xanadu release, the legacy version of ServiceNow Studio is being prepared for future deprecation. It will be hidden and no longer activated on new instances but will continue to be supported. For details on the deprecation process, see the Deprecation Process [KB0867184] article in the Now Support Knowledge Base.

Try building and editing apps in the current version of ServiceNow Studio instead. For more information, see ServiceNow Studio.

• Role required: admin
• Link an application to source control
• Apply a stashed change

이 태스크 정보

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. Studio requires developers resolve conflicts before applying remote or stashed changes.

프로시저

1. From Studio, apply remote or stash changes.
   If the system identifies a conflict, it displays the Resolve Conflicts dialog.
2. Select how to resolve the conflict.

   옵션	설명
   Select an action	Apply or discard all stashed changes. Go to Step 3.
   Manually merge changes	Individually select which changes to apply. Go to Step 6.

3. If you want to apply or discard all stashed changes, select an Action.

   옵션	설명
   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.

4. Click Apply Stashed Changes.
   The system applies the selected changes.
5. Click Close Dialog.
6. If you want to merge the conflicting changes, click Manually Apply.
   The system displays a list of version differences by field.
7. Select the field values you want the merged application file to have.
8. Click Save Merge.
   The system applies the selected changes.