--- title: "Desktop merge error: \"The following untracked working tree files would be overwritten by merge\"" description: When performing a local desktop merge, ensure that all local commits are first pushed on both the target and source branch. --- [Skip to content](https://help.copia.io/knowledge/desktop-merge-error-the-following-working-tree-files-would-be-overwritten-by-merge#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. [Desktop App](https://help.copia.io/knowledge/source-control-faq?hsLang=en#desktop-app) # Desktop merge error: "The following untracked working tree files would be overwritten by merge" ## When performing a local desktop merge, ensure that all local commits are first pushed on both the target and source branch. If you are performing a local desktop app merge on files that are tracked with Git LFS and you have not pushed your commits prior to attempting the merge, you may experience a warning like the one seen below. In many cases this can simply be resolved by pushing all local commits on both branches before attempting the merge. However, Copia's recommendation is that you use the Pull Request functionality in the web application to perform merges, especially on binary PLC project files if at all possible. ![](https://help.copia.io/hs-fs/hubfs/image-png-Nov-21-2023-02-21-23-6300-PM.png?width=1010&height=425&name=image-png-Nov-21-2023-02-21-23-6300-PM.png) - [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.