<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<div class="moz-cite-prefix">Hello,<br>
<br>
I just finished the change from master to main as the default
branch. There will be some maintenance MRs so that all our
infrastructure uses the right branch, and then we will remove
master some time next week.<br>
<br>
Cheers<br>
<br>
Paul<br>
</div>
<div class="moz-cite-prefix"><br>
</div>
<div class="moz-cite-prefix">On 28/04/2022 09:18, Paul bauer wrote:<br>
</div>
<blockquote type="cite"
cite="mid:84cd765d-ec16-4047-6fe6-3bab93100c02@gmail.com">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<div class="moz-cite-prefix">Hello again @ gmx-devs</div>
<div class="moz-cite-prefix"><br>
</div>
<div class="moz-cite-prefix">as a lot of time has passed since
this announcement, and as we have the new 2022.1 release out,
I'll go ahead with the change of the default branch on Sunday,
1st of May, in the afternoon Stockholm time.<br>
<br>
Cheers<br>
<br>
Paul<br>
</div>
<div class="moz-cite-prefix"><br>
</div>
<div class="moz-cite-prefix">On 18/03/2022 09:43, Erik Lindahl
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:CAEJJM8EE9SXNa690pzvHO=Y8_TAmdVmn++aPevavzS6Mdefffg@mail.gmail.com">
<meta http-equiv="content-type" content="text/html;
charset=UTF-8">
<div dir="ltr">Hi devs,
<div><br>
</div>
<div>We have considered this in the past, but since we were
then in a very active phase of development we postponed it -
but this might be a good period to do it when we're not
dashing against any particular hard deadline with tons of
development.</div>
<div><br>
</div>
<div>Several large open source projects have switched from
using master/slave terminology due to the historical origin
of the names, and to move towards a more inclusive culture.
One can of course argue it's merely words, but I prefer to
see it the other way - precisely because it's just words and
a very minor inconvenience for us, I would like us to avoid
relying on words that strongly remind others of oppression
and racism.</div>
<div><br>
</div>
<div>Most of these things can be handled through MRs as we go,
but renaming our master branch will require one manual step
for developers tracking the branch. I've pasted the required
commands below. </div>
<div><br>
</div>
<div>My *suggestion* would be that we do this e.g. this Sunday
noon Swedish time (mostly because it should only be 30
seconds of resync), but we can of course also postpone it if
people prefer to - just let us know in that case.</div>
<div><br>
</div>
<div>Cheers,</div>
<div><br>
</div>
<div>Erik</div>
<div><br>
</div>
<div><br>
</div>
<div>Local actions required when master changes to main:</div>
<div><br>
</div>
<div># Switch to the "master" branch:<br>
$ git checkout master<br>
<br>
# Rename it to "main":<br>
$ git branch -m master main<br>
<br>
# Get the latest commits (and branches!) from the remote:<br>
$ git fetch<br>
<br>
# Remove the existing tracking connection with
"origin/master":<br>
$ git branch --unset-upstream<br>
<br>
# Create a new tracking connection with the new
"origin/main" branch:<br>
$ git branch -u origin/main<br>
</div>
<div><br>
</div>
<div><br>
</div>
<div>-- <br>
<div dir="ltr" class="gmail_signature"
data-smartmail="gmail_signature">
<div dir="ltr">
<div>
<div dir="ltr">
<div>
<div dir="ltr">
<div>
<div dir="ltr">
<div>Erik Lindahl <<a
href="mailto:erik.lindahl@dbb.su.se"
target="_blank" moz-do-not-send="true"
class="moz-txt-link-freetext">erik.lindahl@dbb.su.se</a>></div>
<div>Professor of Biophysics, Dept.
Biochemistry & Biophysics, Stockholm
University</div>
<div>Science for Life Laboratory, Box 1031,
17121 Solna, Sweden</div>
<div><br>
</div>
<div>Note: I frequently do email outside
office hours because it is a convenient
time for me to write, but please do not
interpret that as an expectation for you
to respond outside your work hours.<br>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<br>
<fieldset class="moz-mime-attachment-header"></fieldset>
</blockquote>
<p><br>
</p>
<pre class="moz-signature" cols="72">--
Paul Bauer, PhD
GROMACS Development Manager
KTH Stockholm, SciLifeLab
0046737308594</pre>
</blockquote>
<p><br>
</p>
<pre class="moz-signature" cols="72">--
Paul Bauer, PhD
GROMACS Development Manager
KTH Stockholm, SciLifeLab
0046737308594</pre>
</body>
</html>