git pull problem
Since 1 week when I try to update my OpenFOAM-1.6.x version I got the following error message :
cfs10-sanchi /shared/OpenFOAM/OpenFOAM-1.6.x % git pull
remote: Counting objects: 41, done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 24 (delta 5), reused 24 (delta 5)
Unpacking objects: 100% (24/24), done.
46f5187..722d991 master -> origin/master
error: Entry 'etc/settings.csh' not uptodate. Cannot merge.
Has someone experienced such a problem ?
The quick solution:
there's a small explanation about why you should never be working on tracked branches and how to work to avoid this.
|All times are GMT -4. The time now is 02:55.|