Error when doing git pull, unable to resolve

Posted by nubela on Stack Overflow See other posts from Stack Overflow or by nubela
Published on 2010-06-15T05:43:25Z Indexed on 2010/06/15 5:52 UTC
Read the original article Hit count: 296

Filed under:

git

Hi, I'm getting this git error and I don't really get what it means, nor how I can fix it:

(v_env)[nubela@nubela-desktop searchplus]$ git pull origin master
From file:///home/nubela/Workspace/_git/searchplus
 * branch            master     -> FETCH_HEAD
Updating 38f3d5b..fe6028c
error: Untracked working tree file 'searchplus/.project' would be overwritten by merge.  Aborting
(v_env)[nubela@nubela-desktop searchplus]$

I've done the following but to no avail:

git clean -f -d
git reset --hard HEAD

Anyone can help enlighten me? Thanks :)

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More

Developer IT

Error when doing git pull, unable to resolve - Developer IT

Error when doing git pull, unable to resolve

git

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

Can't install git on Ubuntu 12.10

Git apache : unable to push via http

git on HTTP with gitolite and nginx

Redmine git integration - issue in accessing git from redmine but not from external git client

Categories cloud