CFD Online Logo CFD Online URL
www.cfd-online.com
[Sponsors]
Home > Forums > OpenFOAM Installation

git pull problem

Register Blogs Members List Search Today's Posts Mark Forums Read

Reply
 
LinkBack Thread Tools Display Modes
Old   March 8, 2010, 06:13
Default git pull problem
  #1
Senior Member
 
stephane sanchi
Join Date: Mar 2009
Posts: 300
Rep Power: 9
openfoam_user is on a distinguished road
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.
openfoam_user is offline   Reply With Quote

Old   March 9, 2010, 03:37
Default
  #2
Senior Member
 
Mark Olesen
Join Date: Mar 2009
Location: http://olesenm.github.io/
Posts: 777
Rep Power: 18
olesen will become famous soon enough
Quote:
Originally Posted by openfoam_user View Post
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 ?
  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.
olesen is offline   Reply With Quote

Reply

Thread Tools
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off
Trackbacks are On
Pingbacks are On
Refbacks are On


Similar Threads
Thread Thread Starter Forum Replies Last Post
UDF compiling problem Wouter Fluent UDF and Scheme Programming 6 June 6, 2012 04:43
Incoherent problem table in hollow-fiber spinning Gianni FLUENT 0 April 5, 2008 10:33
natural convection problem for a CHT problem Se-Hee CFX 2 June 10, 2007 06:29
Adiabatic and Rotating wall (Convection problem) ParodDav CFX 5 April 29, 2007 19:13
convergence problem Trushar Phoenics 5 August 27, 2002 23:40


All times are GMT -4. The time now is 05:55.