[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...

[solved] libexpat.la missing

Today I got this error:

libtool: link: cannot find the library "libexpat.la" or unhandled argument libexpat.la ubuntu

To solve this issue run in apache source directory

cd srclib/apr-util/xml/expat
./configure
# OR ./configure --prefix=/{{YOURDIR}}/apache/source/httpd-2.2.22/srclib/apr-util/xml/expat/
sudo make install
# OR make install

Remember to clean up your previous apache install after make install failed

cd {{YOURDIR}}/apache/
ls -la
rm -r bin
rm -r build
rm -r include
rm -r lib