Powered by Syntax Highlighter scripts!

gitignore file gets created automatically and git pull does not work


naga.nookala@my_lappy /c/Naga/GitHome/my_proj (master)
$ git pull
Enter passphrase for key '/c/Users/naga.nookala/.ssh/id_rsa':
remote: Counting objects: 57, done.
remote: Compressing objects: 100% (13/13), done.
remote: Total 34 (delta 13), reused 34 (delta 13)
Unpacking objects: 100% (34/34), done.
From github.com:my_proj_path/my_proj
   06598b7..b222fc1  master     -> origin/master
Updating 2330945..b222fc1
error: The following untracked working tree files would be overwritten by merge:
        module_01/.gitignore
        module_01/target/classes/.gitignore
Please move or remove them before you can merge.
Aborting

I was working on eclipse with git eclipse plugin. My project has multiple child modules.
I see that an .gitignore file gets created in a module that I am not currently working on.
When I run the git pull command it fails due to the .gitignore file that got created on the other module.
I tried replcing the .gitignore file from the one on gitindex, but it does not help in resolving git pull.
Then i tried removing it from with in Navigator in eclipse, it gets removed and in no time it gets created automatically.

I am not sure why it is getting created, i guess due to the eclipse git plugin.

To resolve this quickly, I closed my eclipse, deleted the .gitignore file from the windows explorer and ran git pull from git bash, This time the git pull went fine and did not gave me the error.

No comments: