The Awkward Silence

A merge, a conflict, a revert, a bad fix, a new merge, a problem (and then I use the ugly technic to fix things). The good news is, next time I will know how to do things properly (maybe... I think...)

Tinkeringbell

Ah... you know you can abort merging if you want, in case of too many conflicts? (I did it only once or twice, because my code changes were relatively minor and easier to work into a new branch than fixing a lot of conflicts)

But it sounds a bit like that situation I had about partially reverting a revert

JAD

11:22 AM

@Tinkeringbell I think I once reverted a revert :P

Tinkeringbell

@JAD reverting a whole revert is easy.

It's when you're doing stuff partially that you get trouble XD

It becomes pretty hard to keep track of what you should commit and what not, as things are getting counterintuitive.

This revert removed a bunch of files

So you make a revert of the revert > add all those files

Then within that branch, you undo the revert commit > all those files are 'deleted' again

Then you need to commit the files you want to keep deleted...

And then you can merge again

Or something like that

Mithrandir

11:36 AM

I just lost a foot and a half of hair and now I don't recognize myself.

avazula

It's so hot in the office rn and I'd like to remove my tights but my coworkers are here... mmh...

Tinkeringbell

@avazula Visit the toilet :)

Sure, they might notice but at least you're not undressing in front of them ;)

avazula

@Tinkeringbell I'm just going back from it :p

I'm now free o/

Tinkeringbell

Yay!

avazula

Seriously, one major downside of sexism towards people who wear men clothes is when they have to respect the corporate dress code during summer

Tinkeringbell

11:43 AM

Yep.

avazula

Women are free to wear dresses and short sleeves, while men ... well, most of the time they have to wear trousers and long sleeved shirts like in spring or winter. That sucks.

I feel for my male coworkers rn :p

Tinkeringbell

I had meetings with people last summer outside of the office, just so the guys would feel comfortable wearing shorts and a t-shirt ;)

avazula

@Tinkeringbell yay :D

Tinkeringbell

@avazula On the other hand, most offices are actually climate controlled here, and I often bring something long-sleeved just because if I don't, I get too cold ;)

avazula

@Tinkeringbell we don't have AC here ... you're lucky :p

Tinkeringbell

11:46 AM

I guess :)

As long as cold feet and hands count as lucky :P

avazula

@Tinkeringbell idk what's worse between cold or hot extremities :p

Tinkeringbell

I prefer being a bit too hot myself.

Mithrandir

Hot is definitely better

avazula

I can't really stand hot :/ I used to run in a -3°C weather everyday :p

JAD

I prefer being too cold. At some point removing layers isn't possible/legal anymore

2

avazula

11:52 AM

I'd star this but it'd sound perverse :p

JAD

well that's the point

Rainbacon

12:29 PM

@avazula My office relaxes the dress code in the summer. The men typically end up in polo shirts and jeans, I've even seen shorts in the office a few times.

Evening!

@AJ Hello!

wassup?

I'm waiting to hear from a job interview I had yesterday. You?

A J

Writing a stored procedure

Rainbacon

12:38 PM

Good luck with that

A J

same to you

Extroverted Main Man

0

Q: Convey the wish of being grandparent while acknowledging your children views

There are multiple questions about expressing to family/friends that you don't or might not want children. I personally feel that my father's side of the family didn't do a great job about acknowledging that I might not have children while my mother's side was fine. However I can't figure out how...

Ælis

1:05 PM

Someone just show me this list of http error... Enjoy! :p

http.cat

Rainbacon

@Ælis that is wonderful

JAD

shame on them for not being https.cat.

Ælis

@JAD I had the same reaction XD But I believe that this site existed before https was a thing, so they can't change the name domain now. (but the site is in https)

JAD

@Ælis why not both? :P

Rainbacon

Well, the status codes are HTTP status codes, not HTTPS status codes

JAD

1:12 PM

interestingly enough, https.cat also does exist. But uses a sketchy certificate according to chrome

Ælis

avazula

That one's the best

Rainbacon

@avazula Ooh, I forgot about that status code XD

avazula

@Rainbacon How could you

Rainbacon

@avazula I'm very confused by that link

avazula

1:28 PM

@Rainbacon why's that?

Because it's a TAS message in another TAS message?

A J

400 is funny too!

Rainbacon

No, I don't understand why you linked me to the message that you did because I forgot about HTTP 418

avazula

@Rainbacon ha

That's a drawing called "code 418" that I did to celebrate last Hacktoberfest

Sorry if that was confusing

Rainbacon

Ah, now I see.

Ælis

1:44 PM

eyeballs-pls | not enought details/too hypotetical | interpersonal.stackexchange.com/q/21562/21067

IPS Comment Bot

2:27 PM

Marked this comment as caught correctly (tp). Currently marked 1tps/0fps. beep boop My human overlords won't let me flag that, so you'll have to do it yourself.

Rainbacon

2:38 PM

@IPSCommentBot I think we're getting better at this, I clicked that link maybe 3 minutes after it was posted to go flag the comment and it was already gone

avazula

@Rainbacon what bothers me is that it didn't shout at you for giving invalid feedback type

Tinkeringbell

@Rainbacon Meh, it was just me :P I dropped a comment asking for back up there

scohe001

@IPSCommentBot you hear that, bud? Ava's bothered by you

IPS Comment Bot

Invalid feedback type. Valid feedback types are tp, fp, rude, and wrongo

scohe001

@Ava it just needed some incentive ;)

avazula

2:42 PM

@scohe001 rude :p

scohe001

@avazula no u

avazula

:o

sad

Extroverted Main Man

0

Q: How to approach a person that does not respond to me after I was potentially rude?

I am a 18 year old German, I live in a small (~100 Citicens) town neighboring a somewhat bigger (2000 Citicens) town. We have our own small local fire-station but we do not do regular trainings. To get my first firefighting certification I and a group of 5 others (friends) from my station took a ...

conversations conflict-aversion politeness germany rudeness

scohe001

@avazula take a cute piggy to cheer you up<3

2

avazula

aaaaw

Tinkeringbell

3:02 PM

@scohe001 Is that little Babe? :D

scohe001

@Tinkeringbell lol nonono we want an all black one. We'll be getting him probably around June-ish. You'll definitely hear about it ;)

Tinkeringbell

@scohe001 That's color-ist! :P

Looking forward to it though :D

More cute pictures

scohe001

I want him to match my soul! :P that's the story we're going with. We totally don't think the black ones are the cutest

Tinkeringbell

Hahaha

I'm going to get a Flemish Giant rabbit if I can manage it, and if I actually get to buy the apartment we just watched :D

scohe001

Oh my goodness I just googled that

Those things are more like Kangaroos than Rabbits!!

That's a whole lot of fuzziness

Tinkeringbell

3:06 PM

:D

The only thing with rabbits is that you might need two to keep them from getting depressed, and the balcony isn't that big

Our petting zoo always had just the one though..

Then again, there were a lot of kids and smaller rabbits

scohe001

Oof yea it's the same thing with piggies for us. They need a lot of attention. We're lucky that my manager is letting me work from home for a month when we first get him. Hopefully you'll be able to do something similar?

Tinkeringbell

I already work from home two days a week (for as long as that lasts) and I'm at home a lot in the weekends too.

Perhaps, if I'm also conscientious about giving the rabbit attention every evening, that might be enough

I also should find out if I'm even allowed a pet in there XD

scohe001

LOL That may be important :P

Rainbacon

@Tinkeringbell How do you like splitting time between in the office and remote?

Tinkeringbell

@Rainbacon I like it a lot, three days with co-workers in one location is enough for me to socialize, learn, and get stuff done ;) It takes a bit of planning: Make sure you think you have enough stuff to do that you don't need help with during the days at home

The days from home are usually a bit more relaxed, I usually spent a bit more time chatting/being on SE, but I also spread my working hours over larger parts of the day.

I can start at 7, instead of being on a train then

and I can easily end at 9, as I often get stuff done in the evening very well too

When I have to go to the office, it's waking up, being on a train at 7, being settled at the office near 8/8:30. Then I often like to go home at 16, so as to not be too late at home again.

Rainbacon

3:15 PM

That does sound nice. The job I interviewed for yesterday is 2 days a week from home, so if I get it I'll be on that schedule

Tinkeringbell

Sounds good :)

I'm currently fighting a bit with managers. Like I said before, I work for a big company, that essentially put me at one of their major clients. So I have a contract for 40 hours a week with big company, and they say I should work 40 hours a week for major client.

Now they have made the brilliant idea of expecting a lot of people that work in the same field/with the same language to be at one of big companies offices every week for an entire day, to 'socialize, have fun, share knowledge, and opportunities'.

And I'm pushing back against that ;)

Rainbacon

So they want you to do an extra 8 hours that is not for major client?

Tinkeringbell

No, they say those 8 hours are also going to be 'work for the client, but from our office'.

Rainbacon

Oh

And they would replace one of your 2 days at home?

Tinkeringbell

Not really realizing that a.) it takes me 4 hours of public transport each day to get there and back which is private time, but that also means that I'll leave the office earlier, which means I don't make 8 hours that day... and that adding extra socializing, distractions and knowledge sharing is going to be a drain of what time is left

@Rainbacon Yep

(I gotta go, dinner is ready. We can talk a bit further about this after, if there's more questions)

Ælis

3:21 PM

@Tinkeringbell I must say, that definitively sounds awful! Have a nice dinner :)

Tinkeringbell

4:01 PM

@Ælis It is annoying, but I think they legally can do that so :/

Rainbacon

5:46 PM

TIL, never use \w in a regular expression where your strings could possibly be in a language other than english

Tinkeringbell

6:32 PM

@Rainbacon What went wrong?

Rainbacon

\w matches [a-zA-Z0-9]

We had a regex designed to capitalize the first letter of every word in a string

Our site has versions in English and Spanish

Some of the Spanish strings had accented letters

Our regex was (\w)(\w*(\s|$))

That regex doesn't match accented letters as part of the word, so it treats them as word boundaries

So we ended up with words that looked like DireccióN

Tinkeringbell

7:01 PM

Ahh. Blehg :P

Extroverted Main Man

10:35 PM

0

Q: Is my attempt at setting boundaries with my girlfriend the wrong approach?

Background My girlfriend and I have been together for 3 months, and I feel that our relationship is going very well. We are both rather inexperienced when it comes to relationships, but we are lucky to be able to communicate openly and honestly, and this has enabled us to effectively tackle the ...

relationships boundaries

Transcript for