On Fri, May 3, 2019 at 5:57 PM, Bastien Nocera <hadess hadess net>
wrote:
> Seriously Michael, you’re embarrassing yourself.
I don't feel very embarrassed. Your suggested alternative name, "main,"
is clearly considered to be offensive by at least one of the very same
people who don't like "master," and who amazingly appears to be sincere
about this, so does it really still seem like a good option? We're not
going to accomplish much if we replace one apparently-offensive branch
name with another.
Keep trying... eventually we'll find something that is inoffensive. I
don't think anybody has complained about "trunk" yet. At least I don't
think elephants will be contributing to GNOME anytime soon.
Some options to consider:
- "unstable" - One of the examples Bastien has mentioned (in the mail probably best summarizing this thread - thanks to him for that), who have done the branch name change is Redis (and are in progress and discussions for replacing the master-slave terminology everywhere), and they call their main branch/default branch/primary branch (you know what I mean) "unstable" [1]. That seems fair enough and inoffensive enough (in English and in the other few languages I understand), the most offended could be the code sitting there right after a stable release.
GNOME already uses the stable terminology, so unstable would also be "in context", although not having the ma<tab> advantage Bastien mentioned.
- "development"/"develop" - beside the self-explanatory, and fairly generically used "development branch", existing in all revision control systems under one name or another [2]. People familiar with git flow are only familiar with the "develop" branch, meaning the "unstable", code for the latest development snapshot.
So I think there are options, if GNOME chooses to go down this path. (I usually stand with defaults, so I'm ok with master, but I think I could live with the change, if it happens)
Regards,
Robert
Michael
_______________________________________________
desktop-devel-list mailing list
desktop-devel-list gnome org
https://mail.gnome.org/mailman/listinfo/desktop-devel-list
