-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Mark,
On 6/16/20 04:02, Mark Thomas wrote: > All, > > You may have seen the recent discussions both inside and outside > the ASF about the user of "master" as the name of the default git > branch. If you haven't, the short version is that the name can be > traced back to master/slave and its associations with human > slavery. > > I'd like to propose that the Apache Tomcat project renames the > master branch in all of the project repositories. +1 > I think there are two front runners for the new name: > > - main - this looks to be the name GitHub and a number of OSS > projects will be switching to > > - trunk - reflects the Subversion heritage of both the project and > the ASF I'm not picky about the name, but perhaps there is an opportunity, here. Historically, trunk/master is where new development has been done, and releases of the current-latest version of Tomcat are released directly from that branch. Perhaps we could be more clear in that our new development branch is 10.whatever and not trunk/main/master/foo which just happens to cut releases called 10.x from it? Perhaps I am suggesting that we have main/trunk *and* 10.x but I haven't really thought it out. > Committers and contributors will rebase any local branches to > $new_branch A short set of instructions post-migration would be very helpful for me. - -chris -----BEGIN PGP SIGNATURE----- Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl7ssSQACgkQHPApP6U8 pFgp5g/8DNrNJk425nRu01rASo9TLLGqYcf5tVT27b+jFhLH9JnPFQJ6qDODN8QJ o8srgUHsiOnk/HNI+wxjfN2rklIP4gDEEJG8wsqvVQEuHbk3hxrXMHyKdOCENcsp NeuiIdXduJVmJAHHziXs7Aqddf6fnu4yFOBMbaq8uncRqrM0EUgJipMLax0FOBfG tpfp+oefynWyK/whoGGuWUkoiLSjhS6YlrJ2ElU18mztQsAZg1VtDpM1H4C4S9vC HIUoGlor8J14zo2DMt34kleo5YZDbgSbKJzhmXhqfpq0sGtFpUJSRoJjlieHsDMT T1AM12HOT6rXhTHLkxo8pl9ariM0ieHI/YtKDi5NlzHStwII3C0ZAcyPHTYGTeIb 7XFPP1mT7mEEUXW+g2fbpNyUNwceXO/zDg2NfEbUKN+yG94PWcY1tSgoLRrv9o2h /U81iM/rFZqxqZ+YOLtYoAcjVYaR106/fTCLeRMZWO7sgzknLHrDE52EoHA6cnkr ABkQX4fKt70V9oVf61v/0WuKyI2O3EB3R5Yc5NZgmx+gFoqSarE6HOX/5sOAPoHj /zFTUt19zf/6yyTLIQSbz/Sh6jzAhi44nVArNO4kX/S4w55jf7mJbZRiryhYW1xN gfwq9RvNtvR+r22NAlvKKRKJjMpslnAgbUDqENvuF+qurdrEgtg= =xOny -----END PGP SIGNATURE----- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
