CODEWITHSUNDEEP
gitgithub
Tampa
Tampa

Reputation: 78234

Git pull - error: The following untracked working tree files would be overwritten by merge:

I keep getting this error when I do a git pull every 60 seconds on my monitoring server. I am using chef and a python script to "git pull" every 60 seconds. 

Updating 70fe6e8..2da34fc
error: The following untracked working tree files would be overwritten by merge:
    rtb_redis_connections/redis_connections.pyc
Please move or remove them before you can merge.
Aborting

How do I deal with this? these pyc files keep getting created.

Upvotes: 18

Views: 66967

Answers (5)

Srikanth Lanka
Srikanth Lanka

Reputation: 67

Please move or remove them before you can merge.

Aborting

The solution is actually very simple:

git clean  -d  -fx ""
  • X - delete ignore file has not identified for git files
  • D -- deletion was not added to the git in the path of the file
  • F - forced operation

Upvotes: 5

Edson Medina
Edson Medina

Reputation: 10269

Try this:

git config --global core.trustctime false

Upvotes: -1

ralphtheninja
ralphtheninja

Reputation: 132988

My guess is that someone else has accidentally committed this file. How to resolve this:

Remove your local .pyc file

rm rtb_redis_connections/redis_connections.pyc

Do the pull

git pull

Remove the file from git and push up the changes

git rm rtb_redis_connections/redis_connections.pyc
git commit -m "Remove pyc file"
git push origin master

Assuming that you are working on the master branch that is.

Upvotes: 31

fdsaas
fdsaas

Reputation: 714

You either need to add te rtb_redis_connections directory to the repository so that it tracks to the remote, or add the files or directory to .gitignore.

Upvotes: 1

Vitalii Zurian
Vitalii Zurian

Reputation: 17976

Why don't you put them to .gitignore?

Upvotes: 3

Related Questions