Habe gerade beim git Update folgende Fehlermeldung erhalten:
Code: tobi@shorty:~/OpenFOAM/OpenFOAM-1.7.x$ sudo git pull [sudo] password for tobi: Updating 5967220..a54150c error: Your local changes to 'etc/controlDict' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge. tobi@shorty:~/OpenFOAM/OpenFOAM-1.7.x$