Linked by Thom Holwerda on Fri 15th Jun 2007 22:17 UTC, submitted by prymitive
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.
To read all comments associated with this story, please click here.
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.
RE[2]: Branching vs. Merging
by vermaden on Sat 16th Jun 2007 09:36
in reply to "RE: Branching vs. Merging"
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?
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.
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
RE: Branching vs. Merging
by hobgoblin on Sat 16th Jun 2007 01:39
in reply to "Branching vs. Merging"
Member since:2005-07-06
RE: Branching vs. Merging
by happycamper on Sat 16th Jun 2007 14:56
in reply to "Branching vs. Merging"
News
Linked by Thom Holwerda on 05/23/13 23:22 UTC
"Ilja van Sprundel, a security researcher with IOActive, has discovered a large number of issues in the way various X client libraries handle the responses they receive from servers, and has worked with X.Org's security team to analyze, confirm, and fix these issues."
Linked by Thom Holwerda on 05/23/13 22:04 UTC
"Google is facing a new antitrust probe by the U.S. Federal Trade Commission into whether the company is using its leadership in the online display-advertising market to illegally curb competition, people familiar with the matter said." Sucks to be Google today, apparently.
Linked by Thom Holwerda on 05/23/13 22:01 UTC
"In the midst of the major press blitz surrounding its annual I/O Conference, Google dropped some unfortunate news about its instant messaging plans. In several places around the web, the company is replacing the existing 'Talk' platform with a new one called 'Hangouts' that sharply diminishes support for the open messaging protocol known as XMPP (or sometimes informally Jabber), and also removes the option to disable the archiving of all chat communications. These changes represent a switch from open protocols to proprietary ones, and a clear step backward for many users." That's why I always say: only suckers trust companies.
Linked by Thom Holwerda on 05/23/13 17:52 UTC
"The wave of departures is a sign of internal struggle, but amidst all the bad news, there is a glimmer of hope. According to an anonymous HTC executive cited by WSJ, the crucial HTC One is selling 'pretty good so far'. The executive revealed that HTC sold about five million One units since launch, a performance that is deemed encouraging. However, sales have been limited by the persisting supply issues that still plague the production of the HTC One." Finally some good news for HTC. Five million units amidst supply constraints is very impressive.
Linked by Thom Holwerda on 05/22/13 22:23 UTC
"Sony gave the PS4 50% more raw shader performance, plain and simple (768 SPs @ 800MHz vs. 1152 SPs & 800MHz). Unlike last generation, you don't need to be some sort of Jedi to extract the PS4's potential here. The Xbox One and PS4 architectures are quite similar, Sony just has more hardware under the hood. Weâll have to wait and see how this hardware delta gets exposed in games over time, but the gap is definitely there. The funny thing about game consoles is that itâs usually the lowest common denominator that determines the bulk of the experience across all platforms. On the plus side, the Xbox One should enjoy better power/thermal characteristics compared to the PlayStation 4. Even compared to the Xbox 360 we should see improvement in many use cases thanks to modern power management techniques." AnandTech does its usual in-depth thing.
Linked by Thom Holwerda on 05/22/13 13:38 UTC
"The Verge has learned that HTC's Chief Product Officer, Kouji Kodera, left the company last week. Kodera was responsible for HTC's overall product strategy, which makes the departure especially notable on the heels of the global launch of the make-or-break One. It's not just Kodera. In the past three-odd months, HTC has lost a number of employees in rapid succession." I really hope HTC pulls it together.
Linked by Thom Holwerda on 05/22/13 13:30 UTC, submitted by JRepin
"It is with huge pleasure that the Debian GNU/Hurd team announces the release of Debian GNU/Hurd 2013. This is a snapshot of Debian 'sid' at the time of the Debian 'wheezy' release (May 2013), so it is mostly based on the same sources. It is not an official Debian release, but it is an official Debian GNU/Hurd port release." Important note: 75% of Debian packages are supported bu Debian GNU/Hurd. Impressive.
Linked by Thom Holwerda on 05/21/13 22:06 UTC
"The first killer app was VisiCalc. This early spreadsheet turned the Apple II from a hobbyist toy to a business computer. VisiCalc came with room for improvement, though. In addition, a new architecture and operating system, the Intel-based IBM PC and MS-DOS, also needed a spreadsheet to be taken seriously. That spreadsheet, released in early 1983, would be Lotus 1-2-3, and it would change the world. It became the PC's killer app, and the world would never be the same. On May 14, IBM quietly announced the end of the road for 1-2-3, along with Lotus Organizer and the Lotus SmartSuite office suite. Lotus 1-2-3's day is done." Impressive 30 year run.
Linked by Thom Holwerda on 05/21/13 21:45 UTC
"There's a disconnect between how Apple CEO Tim Cook sees his company's tax strategies and how some members of the US Senate view it. That became clearer than ever today after Cook and two other Apple executives testified before Congress, explaining why they're holding most of their international income in Irish subsidiaries like Apple Operations International, which declare no tax residency anywhere in the world. AOI hasn't filed a tax return anywhere in the world for the last five years, yet it earned $30 billion in income from 2009 to 2012, according to a Senate report released yesterday." Just because something is legal, doesn't mean it's just. Apple, Google, Microsoft, and many more - these companies might not be breaking any laws, but it's obvious to anyone that what they are doing is scummy.
Linked by Thom Holwerda on 05/21/13 15:53 UTC
The new WebKit Opera for Android has been released. "Opera 14 for Android is built on top of Chromium 26, with a total overhaul of the UI in native code, making it fit well with the latest Android design guidelines. Go get the build from Google Play or point your browser to m.opera.com, and give it a spin!"More News »
Sponsored Links
Member since:
2007-03-24
Could some one explain the difference between branching and merging before going on please?