The development branch is renamed to main. Checks: - All tests pass. - Git history is intact
How to update local development branches? -- code (assuming origin is your fork) -- git branch -m master main git fetch origin git branch -u origin/main main git remote set-head origin -a -- code -- Best Regards, Janardhan On Mon, Nov 1, 2021 at 6:25 PM Janardhan <janard...@apache.org> wrote: > Hi all, > > There is a branch rename to main in the systemds repo. > This process should take not more than 30 minutes max. > > The push won't work as is for now. > > Thank you, > Janardhan > > > On Sun, Oct 31, 2021 at 8:00 PM Janardhan <janard...@apache.org> wrote: > >> Thank you, >> >> > in general, I think a rename to main is a good idea as long as there is >> > no danger of messing up the history. >> >> I have changed my fork's branch to main [1], and the changeset applies >> cleanly. >> >> > Looking over the issues, some like 'master' and 'sanity >> > check' should be fixed >> >> The Android project has some workarounds[2][3] for these. >> >> Few examples as a starting point: >> >> present word | alternatives >> -- | -- >> sanity check | check, validate, readiness check >> first class citizen | core feature, built-in, top-level >> master | primary >> >> > while others like the gendered pronoun 'he' seem >> > false positives as they point to paper references like 'He et al.' >> >> I am reaching out to the people concerned to address[4] these in the tool. >> For example, only flag words alone not a substring as in 'mastercard' >> >> -- >> [1] https://github.com/j143/systemds/commits/main >> [2] https://source.android.com/setup/contribute/respectful-code >> [3] https://developers.google.com/style/word-list#letter-m >> [4] https://github.com/Humbedooh/clc/issues/6 , #8 >> >> Best Regards, >> Janardhan >> >> On Sun, Oct 31, 2021 at 7:22 PM Matthias Boehm <mboe...@gmail.com> wrote: >> >>> in general, I think a rename to main is a good idea as long as there is >>> no danger of messing up the history. Thanks for taking this over. >>> >>> Related to this, the ASF shared end of August a new 'conscious language >>> checker' [1]. Looking over the issues, some like 'master' and 'sanity >>> check' should be fixed, while others like the gendered pronoun 'he' seem >>> false positives as they point to paper references like 'He et al.' >>> >>> [1] https://clc.diversity.apache.org/analysis.html?project=systemds.git >>> >>> Regards, >>> Matthias >>> >>> On 10/31/2021 8:00 AM, Janardhan wrote: >>> > Hi all, >>> > >>> > Interest in this change (for context [1]) has been previously mentioned >>> > by the team at different points, and some of the projects have made >>> this >>> > transition. >>> > >>> > If the team agrees to this change, we can file an infra request, like >>> [2]. >>> > Also, this change can happen on a working day, mostly by Monday >>> > evening (GMT+2) or the next business day. >>> > >>> > What will change: >>> > >>> > 1. Changes to the systemds repo [3] >>> > 2. Changes to website repo [4] >>> > 3. Would you like to suggest any other changes? >>> > >>> > How we can update our local branch to main: >>> > >>> > -- code (assuming origin is apache/systemds) -- >>> > >>> > git branch -m master main >>> > git fetch origin >>> > git branch -u origin/main main >>> > git remote set-head origin -a >>> > >>> > -- code -- >>> > >>> > -- >>> > [1] https://sfconservancy.org/news/2020/jun/23/gitbranchname/ >>> > [2] https://issues.apache.org/jira/browse/INFRA-21748 >>> > [3] https://github.com/apache/systemds/pull/1429 >>> > [4] https://github.com/apache/systemds-website/pull/105 >>> > >>> > Thanks and Regards, >>> > Janardhan >>> > >>> >>
