Skip to content
English
More support Sign in
Contact us
  • There are no suggestions because the search field is empty.

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.