retdec: git pull error: The following untracked working tree files would be overwritten by merge

Pulling a new master ends with the following error:

$ git pull
error: The following untracked working tree files would be overwritten by merge:
        deps/googletest/CMakeLists.txt
        deps/libdwarf/CMakeLists.txt
        deps/llvm/CMakeLists.txt
Please move or remove them before you can merge.
Aborting

About this issue

Original URL
State: closed
Created 6 years ago
Comments: 17 (2 by maintainers)

Commits related to this issue

🚧 Doom Weapon - Super Shotgun - Main Image 🚧 Added in this commit: • New picture + Super Shotgun A big applause and shoutout to mtkumar82: • git fetch --all • git reset --hard ... — committed to Danielkaas94/Xenonauts-Mods by Danielkaas94 4 years ago

Most upvoted comments

git fetch --all git reset --hard origin/{{your branch name}}

This worked for me, May be helpful for other.

+53

mtkumar82 on Jun 13, 2019

$ git add * $ git stash $ git pull origin master/{branch_name}

You will lose the local changes however.

subhashree-r on Sep 10, 2019

git fetch --all git reset --hard origin/{{your branch name}}

This worked for me, May be helpful for other.

omgthank you

alpizano on Feb 18, 2020

Even after performing the above steps my issue was not solved. So, unfortunately, I created a new folder and cloned.

git clone "_repo_path_"

Shravankumarhiregoudar on Jul 1, 2019