News for hackers. Stuff that matters.
Re:Rails and Merb Merge by mdemare on Tuesday December 23, 2008 @03:16PM (#408035)
Impressive! How often do you hear about two open-source projects merging? Forking is much more common. I can't even recollect other instances of merging.

Best of luck to the two teams with making it work!

Re:Rails and Merb Merge by jm4 on Tuesday December 23, 2008 @03:23PM (#408043)
Compiz and Beryl. Beryl forked from Compiz and, if I remember correctly, relations were very sour between the two projects. Several months later they merged into Compiz Fusion.
Re:Rails and Merb Merge by cosmo7 on Tuesday December 23, 2008 @07:35PM (#408277)
Can people stop coming up with examples? You're ruining mdemare's argument.
Re:Rails and Merb Merge by rmaccloy on Tuesday December 23, 2008 @08:21PM (#408340)
Well, in the case of GCC/egcs and KHTML/WebKit, it's not quite a precise merge; egcs and WebKit won.
Re:Rails and Merb Merge by tlrobinson on Tuesday December 23, 2008 @05:22PM (#408162)
KHTML and WebKit (though I'm not sure what the status of the "unforking" is): http://arstechnica.com/journals/linux.ars/2007/07/23/the-unf...
Re:Rails and Merb Merge by dabeeeenster on Tuesday December 23, 2008 @05:26PM (#408168)
WebWork and Struts merged to become Struts 2...
Re:Rails and Merb Merge by rapind on Wednesday December 24, 2008 @08:31AM (#408776)
This is the best comparison. Struts was great when it came out and inspired a lot of 2nd gen frameworks like Webwork. Webwork was very clever and much improved over struts. However, struts was far more popular. Bringing the two together created a better product that was adopted by the mainstream java web developers. It was a great way to get the developers that were stuck on struts (for whatever reason, most likely to support existing code bases) into a better design.

In about a year I could write the paragraph above substituting rails for struts, merb for webwork, and java for ruby.

Re:Rails and Merb Merge by davidw on Tuesday December 23, 2008 @06:33PM (#408214)
gcc forked at one point, and was subsequently merged back into the main branch. Still, though, it's not an everyday thing.