These are chat archives for Microsoft/visualfsharp

10th
Apr 2015
Jon Wood
@jwood803
Apr 10 2015 14:36
I’m just curious here…is the fsharp4 branch the main one?
mpkh
@mpkh
Apr 10 2015 15:44
it should be but...
not sure
Enrico Sada
@enricosada
Apr 10 2015 15:48
It is
The fsharp4 is development for new version
Enrico Sada
@enricosada
Apr 10 2015 16:03
Master is version 3.x
Lincoln Atkinson
@latkin
Apr 10 2015 16:29
fsharp4 is the "main" branch in the sense that it's where most development is happening. Technically master is designated in GitHub as our primary branch. [edit] - oops, fsharp4 actually is the default GitHub branch, too
Jerold Haas
@jeroldhaas
Apr 10 2015 16:30
@latkin I think your answer confused me more :wink:
Lincoln Atkinson
@latkin
Apr 10 2015 16:30
Err, sorry I have confused myself. Forget I said that, it's not even correct. fsharp4 is in fact the default GitHub branch, too
Jerold Haas
@jeroldhaas
Apr 10 2015 16:31
Too used to SVN terms. Default branch means "trunk" in my mind. :wink:
Which, I'm guessing here, is not a term in git at all?
Enrico Sada
@enricosada
Apr 10 2015 16:32
Fsharp4 = trunk
Jerold Haas
@jeroldhaas
Apr 10 2015 16:32
:thumbsup:
Enrico Sada
@enricosada
Apr 10 2015 16:32
Master = rb-3.1
Lincoln Atkinson
@latkin
Apr 10 2015 16:34
Changes don't flow from fsharp4 -> master though. They do flow from master -> fsharp4
Enrico Sada
@enricosada
Apr 10 2015 16:34
In git like svn is a naming convention, and usually is master = trunk
Exactly, in visual fsharp the master is like a release branch. And fsharp4 the trunk
Jon Wood
@jwood803
Apr 10 2015 17:03
That’s probably why I got confused in that PR for the branch and why I was having issues merging :bomb:
Lincoln Atkinson
@latkin
Apr 10 2015 17:04
too many arboreal metaphors :smile: