---
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


---

# Legacy - Resolve conflicts

# Legacy - 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

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

## Antes de Iniciar

Importante:  
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\]](https://support.servicenow.com/kb_view.do?sysparm_article=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](https://servicenow-prod.fluidtopics.net/HJE5fDsb~bjmVZ9BqGtS8w "ServiceNow Studio provides a unified experience for all ServiceNow development activities, enabling admins and developers to extend base system solutions and create custom apps with ease. Use ServiceNow Studio to build apps and app files with integrated tools, access and edit app metadata in scoped and global apps, and package app changes for deployment, all in one powerful development tool.").

* Role required: admin
* Link an application to source control
* Apply a stashed change
{#t_ResolveConflicts__ul_olt_w5w_hv}

## Por Que e Quando Desempenhar Esta Tarefa

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.

## Procedimento

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.

   | Opção | Descrição |
   | Select an action | Apply or discard all stashed changes. Go to [Step 3](https://servicenow-prod.fluidtopics.net/lvMD3~q1my2ilI9iDUj_eQ#t_ResolveConflicts__SelectAction). |
   | Manually merge changes | Individually select which changes to apply. Go to [Step 6](https://servicenow-prod.fluidtopics.net/lvMD3~q1my2ilI9iDUj_eQ#t_ResolveConflicts__Merge). |
   |-|-|

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

   | Opção | Descrição |
   | 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. |
   |-|-|

   {#t_ResolveConflicts__choicetable_wln_1bv_lv} {#t_ResolveConflicts__SelectAction}
{#t_ResolveConflicts__SelectAction}
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. {#t_ResolveConflicts__Merge}
{#t_ResolveConflicts__Merge}
7. Select the field values you want the merged application file to have.
8. Click Save Merge.  
   The system applies the selected changes.