I'm not trying to do an advertisment for anything. I read and re-read this stupid article over and over and over. Could someone please explain what the heck this means? I mean, trunks, branches, I get the tree metaphor, but I still can't put that together with the text and come up with anything.
Aviary Branch Landing Puts Firefox on the Road to 1.1
Last week, the Aviary branch landed on the trunk, bringing the trunk builds of Mozilla Firefox into line with Firefox 1.0. The Aviary branch was cut from the 1.7 branch earlier this year, allowing Mozilla 1.8 development to continue on the trunk without the worry that radical changes (such as those made to Gecko) would adversely affect the stability of Firefox 1.0 and Thunderbird 1.0.
Changes to core Mozilla components like Gecko were only checked into trunk and not the Aviary branch, while late-breaking Firefox 1.0 features (like the Find bar and the Plugin Finder Service) were only checked into the Aviary branch and not the trunk. Both Firefox 0.9 and 1.0 were released from the Aviary branch.
Now the Aviary branch has landed, all Firefox development is focused on the trunk builds, which have both the latest core component fixes (such as a patch for the infamous Slashdot rendering bug) and all the Firefox 1.0 features. The landing took place over two days, causing temporary build problems and some regressions (check The Burning Edge for the latest status on the regressions). Gory details about the Aviary branch landing are available.
