I believe this action is pretty much complete. I have updated the website to fix broken links/references to the old 'master' branches, and am working through the other repos for other, now broken, references to any master branch.
On Thu, Aug 6, 2020 at 8:01 AM Christopher <[email protected]> wrote: > > This decision passes unanimously. > > * I have prepared all 11 of our repos by creating a 'main' branch in > each one, based on their 'master' branch, and have updated all open > PRs whose base branch was 'master' to now be 'main'. > * I have also created an INFRA request > (https://issues.apache.org/jira/browse/INFRA-20647) to change the > default branch. > * After that action is completed by INFRA, I will double check the > 'master' branch in each repo to ensure all its commits are in 'main', > and will ensure there are no new PRs against any 'master' branch, > before deleting the old branches. > * After that, I will do a pass through our documentation/website to > ensure links aren't broken and that .asf.yaml is still correctly > configured to stage our website. > > What you can do to help is: update your local clones and your forks, > so that the 'master' branch is fully gone. > > You can update your local clones by doing: > git remote update --prune && git checkout -t upstream/main && git > branch -d master > > After the default branch is changed by INFRA, you can also do the > following if you wish: > git remote set-head upstream -a > > (Both of these lines assume "upstream" is the name of your upstream remote). > > It is also possible to delete your forked copies of the branch named > 'master'. Let me know if you need help with that. > > Thanks, > Christopher > > On Tue, Aug 4, 2020 at 7:21 PM Nathaniel Freeman <[email protected]> wrote: > > > > +1 > > > > > On 3 Aug 2020, at 07:58, Christopher <[email protected]> wrote: > > > > > > p from our previous conversation on this issue, I have > > > already started a new branch named 'main' for my own future > > > contributions (that name because it appears to be the trending > > > alternative to 'master'), and for others who wish to use it as an > > > alternative to the current 'master' branch. I intend to discontinue > > > merging contributions (my own or others) to any 'master' branch owned > > > by the Accumulo PMC. > > > > > > In conjunction with that practice that I intend to follow, I would > > > like to propose the following as a lazy vote (by that, I mean I'm just > > > going to do it if nobody votes; if somebody objects, this turns into a > > > majority vote): > > > > > > 1. Submit an INFRA ticket to change the default branch to 'main' for > > > all our repos (I'll make sure one is created in each before then), and > > > 2. Update all our PRs against 'master' to be based on 'main' instead, and > > > 3. Delete the branch currently named 'master' (after the first two > > > steps and ensuring 'main' contains all of its commits) > > > > > > This effectively results in a rename > >
