[solved] git updating directory error

Today, my collaborator in a project replaced webapp/gwt/ directory with dynamic link to war/gwt directory

In .gitignore we had only this statement:

...
webapp/gwt/* 
...

During the pull origin somebranch i got this error:

git error: Updating the following directories would lose untracked files in it:
{{yourdir}}

Solution:

rm -rf {{yourdir}}
git pull origin {{somebranch}}

and add to .gitignore the conflicting dynamic link.

Google wasn't very helpfull this time. I hope this tip will help someone in the future...