--- title: How do I resolve conflicting files in the Copia Desktop App? description: How to resolve conflicting files --- [Skip to content](https://help.copia.io/knowledge/how-do-i-resolve-conflicting-files#main-content) English Show submenu for translations [More support](https://help.copia.io/knowledge/kb-tickets/new?hsLang=en) ![](https://help.copia.io/hubfs/Logo_Hotdog_BlackWhite%20(1).svg) Open main navigation Close main navigation - English Show submenu for translations - [More support](https://help.copia.io/knowledge/kb-tickets/new) - Contact us Contact us How can we help you? - There are no suggestions because the search field is empty. 1. [Copia Help Center](https://help.copia.io/knowledge?hsLang=en) 2. [Source Control FAQ](https://help.copia.io/knowledge/source-control-faq?hsLang=en) 3. [Source Control](https://help.copia.io/knowledge/source-control-faq?hsLang=en#source-control) # How do I resolve conflicting files in the Copia Desktop App? ## How to resolve conflicting files If you open a pull request and see the below message, you will need to resolve the conflict in the Desktop App by completing the following steps. ![Screenshot 2023-07-06 085910](https://help.copia.io/hs-fs/hubfs/Screenshot%202023-07-06%20085910.jpg?width=577&height=207&name=Screenshot%202023-07-06%20085910.jpg) 1. Select *Open in Desktop App* 2. Navigate to the branch you are trying to merge into (Most often this is going to be the *main* branch) 3. In the top toolbar, select *Branch \> Merge into current branch* 4. Choose the branch you are trying to merge into this branch. You should see that a conflict is indicated in the bottom of the window.   ![image-Jul-05-2023-09-13-05-9263-PM-1](https://help.copia.io/hs-fs/hubfs/image-Jul-05-2023-09-13-05-9263-PM-1.png?width=545&height=129&name=image-Jul-05-2023-09-13-05-9263-PM-1.png) 5. You can resolve the conflict by choosing which version of the file you would like to keep ![image-Jul-05-2023-09-14-44-5447-PM](https://help.copia.io/hs-fs/hubfs/image-Jul-05-2023-09-14-44-5447-PM.png?width=688&height=263&name=image-Jul-05-2023-09-14-44-5447-PM.png) 1. Alternatively, if the file is text-based, you can click "Open with default program" to open in a text editor and resolve the conflicts manually. The image below shows how git highlights the differences between the branches. You can select one entire line or the other, or you can manually combine them![](https://help.copia.io/hubfs/image-png-Jul-06-2023-03-15-27-9231-PM.png) 2. This is what the file would look like after I've resolved the conflict using the text editor![](https://help.copia.io/hubfs/image-png-Jul-06-2023-03-17-06-7808-PM.png) 6. After making your selection, select *Commit Merge* 7. Push your changes   Elements of the UI may have changed since the time of posting. For the most up-to-date information, refer to [our Documentation](http://docs.copia.io/). - [Getting Started](https://help.copia.io/knowledge/getting-started?hsLang=en#main-content) - [Sales Wiki](https://help.copia.io/knowledge/getting-started?hsLang=en#sales-wiki) - [Account Management](https://help.copia.io/knowledge/getting-started?hsLang=en#account-management) - [Customer Experience](https://help.copia.io/knowledge/getting-started?hsLang=en#customer-experience) - [Source Control FAQ](https://help.copia.io/knowledge/source-control-faq?hsLang=en#main-content) - [Web App](https://help.copia.io/knowledge/source-control-faq?hsLang=en#web-app) - [Git Questions](https://help.copia.io/knowledge/source-control-faq?hsLang=en#git-questions) - [Desktop App](https://help.copia.io/knowledge/source-control-faq?hsLang=en#desktop-app) - [Tutorials](https://help.copia.io/knowledge/source-control-faq?hsLang=en#tutorials) - [Best Practices](https://help.copia.io/knowledge/source-control-faq?hsLang=en#best-practices) - [Source Control](https://help.copia.io/knowledge/source-control-faq?hsLang=en#source-control) - [DeviceLink FAQ](https://help.copia.io/knowledge/devicelink-faq?hsLang=en#main-content) - [Siemens TIA Portal](https://help.copia.io/knowledge/devicelink-faq?hsLang=en#siemens-tia-portal) - [Agent](https://help.copia.io/knowledge/devicelink-faq?hsLang=en#agent) - [General](https://help.copia.io/knowledge/devicelink-faq?hsLang=en#general) - [Rockwell Studio 5000](https://help.copia.io/knowledge/devicelink-faq?hsLang=en#rockwell-studio-5000) [![Chill listening crop-3](https://help.copia.io/hs-fs/hubfs/Logo_Hotdog_BlackTeal-1.png?width=87&height=24&name=Logo_Hotdog_BlackTeal-1.png "Chill listening crop-3")](http://copia.io) 43 W 24th St, 6th Floor New York, NY 10010 [mailto:email@email.com](mailto:email@email.com) Copyright © 2025, Copia Automation, Inc.