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

Which version is current development line for 15

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

Reply
 
LinkBack Thread Tools Display Modes
Old   January 22, 2009, 03:49
Default The script is in OpenFOAM-1.5-
  #21
Member
 
Michael Wild
Join Date: Mar 2009
Location: Bern, Switzerland
Posts: 79
Rep Power: 8
mwild is on a distinguished road
Quote:
The script is in OpenFOAM-1.5-dev/bin.
What do you mean by this?

Quote:
so a direct merge will not be good
Why? All git-merge does (roughly speaking) is apply the patches of the individual commits.

Up to which git commit (SHA1-ID would be useful) are you sure you merged the two properly? Because that would help already a lot! If I know that, I can tell git to merge up to that commit ID and always pick "our" version. I think that would rule out most of the conflicts, leaving only those which are fairly recent.
mwild 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
Which version is current development line for 15 dkingsley OpenFOAM Installation 0 January 12, 2009 09:18
Development version download guillaume OpenFOAM Installation 30 October 15, 2008 00:59
Current development of overset grid/recommendation CH Main CFD Forum 1 October 23, 2006 00:57
NEKTON is integrated in current FLUENT version???? daniel Main CFD Forum 1 April 4, 2006 00:17
Cells of current line in three dimensionnal flow GACEM_hatem Phoenics 2 June 18, 2001 09:38


All times are GMT -4. The time now is 07:26.