|author||Lars Wirzenius <email@example.com>||2021-02-23 10:59:43 +0200|
|committer||Lars Wirzenius <firstname.lastname@example.org>||2021-02-23 10:59:43 +0200|
1 files changed, 24 insertions, 25 deletions
diff --git a/conflict.mdwn b/conflict.mdwn
index bb298cb..8acf12e 100644
@@ -19,7 +19,7 @@ the middle of something, finish that, I can start on my own."
In a minute, I hear Robin's combat boots stomping towards my office.
She throws open my door, not bothering to knock. Oh good, I've upset
her. Robin steps into my office and stands in front of my desk. In
-addition to black leather boots, she's wearing cargo trousers, and a
+addition to the boots, she's wearing cargo trousers, and a
photographer's multi-pocketed vest over a thin, green, army sweater and
a uniform dress shirt. It's one of her favourite outfits, on days when
she doesn't expect to have to deal with customers in person.
@@ -29,7 +29,7 @@ she doesn't expect to have to deal with customers in person.
Robin is a dear friend, but it's taken me a lot of effort to get used
to her habit of not bothering with social niceties when she's upset. I
know she's not upset at me, which helps, but the loud voice, and the
-wording easily puts the other on the defensive. While I've gotten used
+wording easily puts the others on the defensive. While I've gotten used
to it, we've also made sure Robin avoids this behaviour in front of
others, including the Team.
Originally she said she felt like a fraud when she hid her
@@ -43,7 +43,7 @@ breathes, sits down, and says, in a normal voice, "OK, so what's going
I explain about Sam's email from yesterday. "Clearly, we're not
-switching to RPM. We've built our system based on .deb packages, But
+switching to RPM. We've built our system based on .deb packages, but
we need to explain to SmartHome why we're not switching. I thought
we'd outline a response together, and I'll flesh it out and reply by
email. Here's what I have in mind so far."
@@ -60,7 +60,7 @@ thinking we should write a small white paper on why we use .deb and
why we're not switching, so we're prepared for this the next time
-I nod. "Good idea, I'll put it on the list to do between clients. Or
+I nod. "Good idea, I'll put it on the list of things to do between clients. Or
better yet, since we need it for SmartHome, we'll write it for them,
and bill the hours to them. The contract says we can reuse that kind
of thing in the future."
@@ -74,7 +74,7 @@ other big point is the cost in time and quality of switching. It's not
just about the format of individual packages, we've built our platform
entirely on top of Debian, and switching to RPM would mean we'd need
to switch to something like RHEL. And then everything changes, since
-the systems are quite different, for all they're built from the same
+the systems are quite different, for all they're built mostly from the same
upstream components. Things like system wide policies differ, and
figuring all of those out is many months of work. Agreed?"
@@ -93,7 +93,7 @@ Robin stands up and leaves, I sit in my chair and flex my fingers over
the keyboard, and hit on "reply" for Sam's mail.
"Dear Sam, we had a little discussion with Robin about switching to
-RPM and I'm afraid it's something we advise against. Let me explain
+RPM and I'm afraid it's something we advise strongly against. Let me explain
@@ -124,8 +124,8 @@ over a few things with him."
walk to my own room. An hour or so later, I need to go see Robin about
something, and I choose the route past Nina's lab. The door is open
and I can hear Nina explain about the trunks. She's not trying to sell
-them, just proudly presenting them geek-to-geek,
-going over very technical detail.
+them, just proudly presenting them, geek-to-geek,
+going them over in very technical detail.
I don't stop, not
wanting to disturb the two, and continue to Robin's room.
@@ -199,7 +199,7 @@ I stand up. "Looks like you have things well in hand. I'm old enough
to have learnt that the universe likes to throw nasty surprises even
in the simplest things, so I'm going to assume it'll take a while
before we actually have Debian running on the SmartHome hardware.
-That's OK, but please do the work in tight weekly sprints so we can
+That's OK, but please do the work in tight weekly iterations so we can
demonstrate progress often to the client. And ourselves."
"Will do." Robin's also been doing this work a long time and knows
@@ -209,7 +209,7 @@ useful, I assume."
"Yep, that's the way. The less we have to keep maintaining ourselves,
the better. Also, if others can benefit from our changes, it's the
-right thing to share them."
+Right Thing to share them."
@@ -238,7 +238,7 @@ The room goes quiet. Most of the engineers squirm in their chairs and
look uncomfortable. Robin looks up, stands up, puts her arms behind
her back, and stares at the two who came in. "What's your name?"
-"Er, I'm Anders." The guy seems to realise he's crossed a line.
+"Er, I'm Anders." The guy seems to realize he's crossed a line.
Right at that moment Sam walks in. Robin looks at him. "Hi Sam, we
have problem. Anders here thought it would be funny to make comments
@@ -254,7 +254,7 @@ telling us what to do." Robin keeps her face as stony as she can,
but it's clear she's fuming.
Sam shakes his head. "I'm afraid I'm going to have to ask you to leave
-the meeting. I'll talk with you after the meeting. Our contract with
+the meeting. I'll talk with you afterwards. Our contract with
the Team is clear, your behaviour is unacceptable when we work with
@@ -288,8 +288,8 @@ with in a reasonable way, we can walk away and leave the project. But
SmartHome will pay our fee anyway."
Robin takes a breath, and frowns a little. "Would you like me to
-insist that Sam fires your ass? I think that would be a reasonable way
-of dealing with you?"
+insist that Sam fires you? Would that be a reasonable way
+of dealing with this?"
Sam takes Anders by the arm and pulls him towards the door. "Anders,
you shut up now, and wait at your desk. You're in trouble now." Anders
@@ -309,7 +309,7 @@ Robin is quiet for a while, and looks at Andy. "I think we'll continue
with the presentation. But first, I'd like to say that I don't require
anything more than basic professional courtesy from those I work with.
I'm sorry for what happened today. It's relatively mild compared to
-some of the things I've encountered in my work life, but I'm not
+some of the things I've encountered in my career, but I'm not
willing to endure any disrespect anymore. I hope the rest of you can
understand that, and that we can work together."
@@ -335,7 +335,7 @@ Anders, it's clearly going to be a problem in the near future.
"I see. Robin, I'm sorry, you were right to be hesitant about taking
on SmartHome as a client."
-Robin shakes her head. "It can't be helped. And for the record, I
+Robin shakes her head. "It can't be helped now. And for the record, I
don't like how things went down today. Not sure Sam handled it
@@ -366,7 +366,7 @@ doubt he's the only sexist jerk there."
"In that case I'll tell Sam that Anders can stay in the project too.
Let's hope he's learnt his lesson and that he and others don't take
-that as an excuse to be jerks, since they see get to keep their
+that as an excuse to be jerks, since they see they get to keep their
jobs anyway. Robin, you've had a rough day, you should probably go home and
relax. You too, Andy."
@@ -384,7 +384,7 @@ himself in the future, he can stay on."
"I just told him that he's going to be formally fired tomorrow."
-"That won't be necessary." I take deep breath, intentionally making it
+"That's not necessary for us." I take deep breath, intentionally making it
noisy so that Sam hears it even over the phone. "Between you and me,
Robin could've handled this privately, but then so could you, Sam.
It's enough of a mess, so I think, we at the Team think, it's gone far
@@ -436,10 +436,9 @@ Andy gives a sketchy summary of Robin's talk. It's what we'd discussed
beforehand. SmartHome was dependent on a central cloud service, for
storing measurements and logs, and for controlling the devices, even
though everything is also stored locally on the hub device. The hub even has
-a local database, a real one, not just Sqlite. A database with 11
+a local database, a real one, not just SQLite. A database with 11
tables with overlapping data and no unique key to match things between
tables. No access control between tables.
-Multiple differenet applications updating the table concurrently.
A pretty mess. The engineers
hadn't liked having their work described that way, but at least most
of them warmed up to the suggestion of having a program provide a simple
@@ -453,11 +452,11 @@ want to be harsh after Anders."
I nod understanding. "OK, sounds like it went reasonably well. I
would've been fine to postpone the presentation by a day or two, to
-let everyone calm down, but sounds like Robin and you did it well."
+let everyone calm down, but sounds like Robin and you did well."
Andy finally goes home. Even he shows signs of it having been a long,
stressful day. Nobody likes confrontations like that. Except maybe the
-kind of macho brogrammer jerk that Anders seems to be like.
+kind of macho brogrammer jerk that Anders seems to be.
I do a final round around the office, and find everything to be dark. I get
my things, turn off the remaining lights, and go home. It's dark, and
@@ -478,7 +477,7 @@ shoulders.
It's Russ. My ex. Well, one of my exes. In a previous life many years
ago we were going out, but it ended. In fact, I was expecting him to
propose, but instead he broke up with me. It was rough on me, but I
-got better. We've not seen each other since. But hearing his voice,
+got over it. We've not seen each other since. But hearing his voice,
and seeing his surprised-happy face brings up pleasant memories. I
guess I really have gotten over the breakup. I smile.
@@ -494,12 +493,12 @@ suitably pseudonymised version of the day's events. It feels good, I
don't often get to talk with a sympathetic friend about my work. He
makes the right kind of noises, and tells about his own life. We
carefully avoid touching on the breakup. I do that to avoid ruining
-this evening. I can take it up with him whenever, today I just want to
+this evening. I can take it up with him some day. Today I just want to
enjoy good company.
Which I do, for longer than is sensible, and with a glass of whisky too
many maybe. When it gets time, we leave, shake hands, and go our
separate ways. Younger me would've gone home with him. Younger me did.
-I've learnt to be sensible since. Russ is very nice tonight, but he
+I've learnt to be more careful since. Russ is very nice tonight, but he
hurt me once. If he's grown and I can trust him to not hurt me again,
we can consider things, but not now. I'm such a romantic.