Thanks for all your suggestions! Most people suggest using “main” instead of “master” for the default #git branch name. I'll start doing that, and try to unlearn a lot of muscle memory. 😛
@xj9 `master` is a sorta gendered term, plus it sounds a little like "master & slave" (I don't use those terms in database replication).
I know it probably doesn't come from that sort of terms, but I'd like to reduce these sort of terms
@ebel I mainly use "upstream".
@algernon I sometimes use `upstream` as a name for the upstream remote. Or as a (local) branch that tracks `upstream/master`.
`upstream` feels different from `master`.
@ebel I guess it depends on how you look at it. Since git is supposed to be distributed, I name the remote after the place I cloned it from (organization, user, umbrella project, whatever), which frees up "upstream" for the branch I submit patches / pull requests to.
In other words, "master" is something you clone and branch from, "upstream" is something you submit and push to. At least in my interpretation.
You're right though, it _is_ different, I just don't find that to be an issue O:)
@algernon When I fork a project, the `upstream` repository is just that, the upstream repo. :)
stable, reference, trunk, main
@gaeel (a few people are suggesting main), but I really like making one for `stable`
@ebel There's sometimes a difference between main/master and stable, in that stable is meant for numbered releases that have undergone user testing, whereas main is where features get merged
Your usage might vary, especially if you use tags to signal stable (as in please use this one in production) versions
@gaeel yes, that's how I'd read/understand the terms.
I mostly mean “I like the idea of having a branch that's always the latest stable so people can check that out”
@ebel I use `main`
@ebel Main or Mainline branch is a better replacement.
@ebel do it!
@ebel For networking stuff instead of master/slave I've used leader/follower.
and now I'm wondering if we can change male and female gendered cables with "inny" and "outy"
@intherain I use "primary" & "secondary" for database replication
@ebel How can we configure git to do this by default in future repositories?
The social network of the future: No ads, no corporate surveillance, ethical design, and decentralization! Own your data with Mastodon!