Show more

good morning; we put Dave's cat bed on the book case and he loves it

Show thread

food 

good morning, Canada got a new food guide and it includes hydration, so make sure you're hydrated!

Show thread

food 

it also includes tips like "cook more often", mindful eating, and awareness of food advertising

I feel like that's a cool step forward. It'd be more cool of ol' JT would just reform food advertising.

oh, but for market forces!

Show thread

good morning, my umbrella broke on my walk to work : \

Show thread

good morning, some nice direct action in my apartment stairwell #praxis

Show thread

Good morning. I thought today would finally be the day that I quit Brooklyn-based politics irony podcasts. Alas,

Show thread

good morning, here’s my new guitar

how do I know it’s mine?

it has my name on it 🤗

Show thread

good morning, I just love Monday mornings because I get to catch up on all my emailsssssss

Show thread

comment about "master" 

@ashfurrow

ugh, we really need to get away from using master in this context :/

comment about "master" 

@maloki @ashfurrow how about we just all agree to use upstream?

It's often the more accurate term, and it doesn't have any unfortunate history.

comment about "master" 

@RandomDamage @maloki "upstream" is good, but is already used for another concept. Naming things is hard! We'll get there, though.

comment about "master" 

@ashfurrow @maloki there's a little overlap, but I think it isn't too bad.

comment about "master" 

@RandomDamage @maloki _I_ agree, but when trying to change the name of something that already exists, little things like this will get used to argue against the change. Programmers gonna programmer.

comment about "master" 

@ashfurrow @maloki true.

All the more reason to just do the thing and let others follow or not ;)

But I chose that one specifically because it's already in use and close to the right meaning.

Beats the pants off what's been done to hacker.

comment about "master" 

@RandomDamage Exactly this, I'm not here for having the arguments, I'm here to create change. We'll probably decide on something and then stick to it. Those who want to follow can, those who don't don't have to. @ashfurrow

comment about "master" 

@maloki @RandomDamage I'm not playing devil's advocate – I like this change, too. I'm only saying that it's important to think about how we might get more people to follow us, how to persuade them.

People will tend to adhere to the status quo, and I think that considering how to win them over is an important part of creating change.

comment about "master" 

@ashfurrow @maloki @RandomDamage Is "main" an option? "upstream" to me sounds like a remote.

comment about "master" 

@uliwitness @ashfurrow @maloki upstream is used in distribution communities to refer to the original source of packages.

Main or trunk works for a primary repository fork.

comment about "master" 

@uliwitness @ashfurrow @maloki @RandomDamage agreed, "main" works as a drop in replacement for "master".

If you're using release branching techniques you should be using stuff like "rel" anyways.
And if the repo is a site, "prod" and "staging" are often good default branch names.

comment about "master" 

@ashfurrow @RandomDamage let's just get a few chosen white men to say it, without them arguing about it with others (and ignore those who do) and I think we'll be fine.

Sign in to participate in the conversation
Elekk: Gameing and Other Delightful Pursuits

The social network of the future: No ads, no corporate surveillance, ethical design, and decentralization! Own your data with Mastodon!