Search Results

Showing results 1 to 4 of 4
Search took 0.00 seconds. Search: Posts Made By: olesen

Forum: OpenFOAM

December 12, 2009, 08:22

Replies: 11

GIT history OF 1.5 to 1.6

Views: 3,873

Posted By olesen

Nope, you didn't miss anything. The merge 'ours'...

Nope, you didn't miss anything. The merge 'ours' approach is, in this case, primarily useful if you want a single repository later with all of the 1.5.x and 1.6.x changes. However, if you have some...

Forum: OpenFOAM

November 25, 2009, 04:55

Replies: 11

GIT history OF 1.5 to 1.6

Views: 3,873

Posted By olesen

That depends largely on how any particular person...

That depends largely on how any particular person does their commits. One extreme are people who like to do lots of changes and commit as one large chunk. In this case you might have a commit...

Forum: OpenFOAM

November 25, 2009, 02:28

Replies: 11

GIT history OF 1.5 to 1.6

Views: 3,873

Posted By olesen

I'm certainly not a git guru either, but the...

I'm certainly not a git guru either, but the merge really is fairly simple.
Instead of squeezing it all in here, I made a blog entry about it instead:...

Forum: OpenFOAM

November 24, 2009, 03:24

Replies: 11

GIT history OF 1.5 to 1.6

Views: 3,873

Posted By olesen

Not a contiguous history, but if you are happy...

Not a contiguous history, but if you are happy with just seeing everything that changed between the two versions (and perhaps registering it in git), that's quite easy to do.

Showing results 1 to 4 of 4

Forum Jump

All times are GMT -4. The time now is 11:12.