Git Pull Error - commit your changes or stash them before you can merge

[omarllorens]

Hi.

It's inform you that you have modify the file log4php.properties and seems that this update want to update this file too, so you have to do a git checkout log4php.properties first and after execute again git pull command.