Den mån 22 juni 2020 kl 20:03 skrev Simon McVittie <s...@debian.org>: > > > On Mon, 2020-06-22 at 17:50 +0200, Michael Biebl wrote: > > > there has been a lot of talk recently about how master is a loaded term > > > that should be avoided. > > > If I read the news correctly, github and others are going to change the > > > default master branch to main. > > > I don't really have any strong opinion on that matter myself. > > Is there consensus that, in projects that want to rename away from > 'master', 'main' is the best replacement name? (I've also seen 'default' > or 'devel' suggested, for example.) Archive-wide changes in Debian tend > to take a very long time, so we might want to wait until there's one > choice that has obviously "won", to be consistent with other git users.
My half cent, as a bystander with regards to Debian, but a git user elsewhere, is that "main" corresponds nicely with "mainline" which is a common term in software projects. "default" seems a bit dubious IMHO - it sort of seems to suggest "commit here if you don't know any better". Which is maybe true for a personal repo, but not a good suggestion if you are a new contributor to some project, and new to git, since you should create a topic branch. "devel" or "develop" I've seen in some workflows that aims to keep "master" super-stable, by performing integration of changes first to "devel" and then after system testing and some sort of release, "master" is updated in one go with a merge from "devel". /Oskar
