Linked by Thom Holwerda on Fri 15th Jun 2007 22:17 UTC, submitted by prymitive
GNU, GPL, Open Source A lengthy debate that began with a suggestion to dual license the Linux kernel under the GPLv2 and the GPLv3 continues on the Linux Kernel Mailing List. Throughout the ongoing thread Linux creator Linus Torvalds has spoken out on the GPLv2, the upcoming GPLv3, the BSD license, Tivo, the Free Software Foundation, and much more. During the discussion, he was asked we he chose the GPLv2 over the BSD license when he's obviously not a big fan of the FSF.
Thread beginning with comment 248233
To read all comments associated with this story, please click here.
Branching vs. Merging
by Chuck Norris on Fri 15th Jun 2007 22:28 UTC
Chuck Norris
Member since:
2007-03-24

Could some one explain the difference between branching and merging before going on please?

Reply Score: 3

RE: Branching vs. Merging
by atezun on Fri 15th Jun 2007 22:50 in reply to "Branching vs. Merging"
atezun Member since:
2005-07-06

Branching means to seperate, ie: forking. You take what you can from the original project and move forward in your own direction.

Merging mean to join, when two projects have similar goals and fairly compatible code bases they can merge and work together on one project instead of two seperate ones.

Reply Parent Score: 5

RE[2]: Branching vs. Merging
by vermaden on Sat 16th Jun 2007 09:36 in reply to "RE: Branching vs. Merging"
vermaden Member since:
2006-11-18

BSD encourage 'branching' [forking] and GPL2 encourage 'merging' ?

So why there are thousands of Linux Distributions [forks] and only several BSD Distributions?

In what way BSD encourages forking? Because it is more free then GPL2?

GPL2 oriented projects love to fork, all those media players, beryl/compiz, window managers and many many many more.

Is it only me see that that way?

Reply Parent Score: 5

RE: Branching vs. Merging
by kwanbis on Fri 15th Jun 2007 22:52 in reply to "Branching vs. Merging"
kwanbis Member since:
2005-07-06

it's just the oposit. You create two branches of a project, by forking them. Like we have ProjectA and you don't like something, you create ProjectA+ that is a fork of my ProjectA.

Merging, would be when i take the modifications you did to ProjectA+ that i like, and merge them back to ProjectA, or viceversa.

Reply Parent Score: 3

RE: Branching vs. Merging
by difool on Fri 15th Jun 2007 22:52 in reply to "Branching vs. Merging"
difool Member since:
2006-09-05

versions evolve in a tree-like structure. however, unlike tree-ish structures, often one or more branches might blend together into a single branch.

a branch is an active line of development. there might be several of them.

to merge is to bring the contents of another branch into the current branch.

http://www.kernel.org/pub/software/scm/git/docs/glossary.html

Reply Parent Score: 2

RE: Branching vs. Merging
by hobgoblin on Sat 16th Jun 2007 01:39 in reply to "Branching vs. Merging"
hobgoblin Member since:
2005-07-06
v RE: Branching vs. Merging
by happycamper on Sat 16th Jun 2007 14:56 in reply to "Branching vs. Merging"