---
sourceDocument: Australia Build or modify applications
sourceDocumentLink: https://servicenow-prod.fluidtopics.net/r/pt-BR/application-development

 Release :

    - australia

ft:locale :

    - pt-BR

ft:publication_title :

    - Australia Build or modify applications

ft:clusterId :

    - cadev

bundleId :

    - cadev

workflow :

    - Development, Data, and Analytics


---

# Resolve conflicts

# Resolve conflicts {#ariaid-title1}

* Versão de lançamento: Australia
* 
* Atualizado 12 de mar. de 2026
* 
* ![](https://www.servicenow.com/docs/portal-asset/ico-clock) 1 min. de leitura

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.

## Antes de Iniciar

[Link an app to source control in ServiceNow Studio](https://servicenow-prod.fluidtopics.net/AJB3RRVvlbN9W7aSTZbKvw "Linking an application or application-customization to source control allows application developers to manage changes in ServiceNow Studio from a Git repository.")

You must have one or more stashed changes applied.

Role required: admin

## Procedimento

1. Navigate to AllApp EngineServiceNow Studio.
2. In the file navigator, select the application you want to open.
3. Select App details to open the app in the canvas.
4. Pull from a repository or stash local changes.  
   If the system detects a conflict, the Resolve Conflicts modal appears.
5. 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. |
   |-|-|

   {#sns-sc-resolving-conflicts__choicetable_mwj_mnj_qfc}
6. 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. |
   |-|-|

   {#sns-sc-resolving-conflicts__choicetable_sg3_ynj_qfc}
7. Select Apply Stashed Changes.
8. Select Close dialog.
9. If you want to merge the conflicting changes, select Manually Apply.  
   The ServiceNow AI Platform displays a list of the version differences by field.
10. Select the field values you want the merged application file to have.
11. Select Save Merge.