git pull problem
 

Hi OF-users,

Since 1 week when I try to update my OpenFOAM-1.6.x version I got the following error message :

[103]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.
From git://repo.or.cz/OpenFOAM-1.6.x
46f5187..722d991 master -> origin/master
Updating 916f000..722d991
error: Entry 'etc/settings.csh' not uptodate. Cannot merge.

Has someone experienced such a problem ?

Regards,

Stephane.

1. Change to your /shared/OpenFOAM/OpenFOAM-1.6.x directory
2. issue commands git status and git diff

You'll notice that you have made some modifications to the files, which often means that you cannot merge with the upstream source. You obviously have 'master' set as a tracking branch of 'origin/master', which means you should not be making changes on the branch that can't be synchronized with the upstream.

The quick solution:

• Move the offending file(s) out of the way. For example, move or copy settings.csh to settings.csh.orig
• Make sure the file is up-to-date (which is what the git error message is telling you). Use, for example, git checkout settings.csh

For the longer-term solution, read this blog entry: http://olesenm.github.com/2009/11/12...nFOAM-and-git/
there's a small explanation about why you should never be working on tracked branches and how to work to avoid this.