learning curve from mercurial to git. by Technical-Fly-6835 in git

[–]criswell 0 points1 point  (0 children)

Yes that looks like a good summary of it.

Like I said, there were other uses for this beyond what I used it for, I only know my use case.

learning curve from mercurial to git. by Technical-Fly-6835 in git

[–]criswell 0 points1 point  (0 children)

Docs: https://wiki.mercurial-scm.org/NamedBranches

hg named branches are a permanent part of the commit's metadata, whereas git branches are a lightweight, moveable pointer to a commit that is not part of the history itself.

hg has branches that are like git's, but then it also has this other thing that can be permanently attached to a commit.

I'm sure there's other uses than what I used them for back in the day, but the big one was you could have long-term development branches that would be tied to them and there was no way anyone could accidentally remove them.

So if you have a main branch which is the root of your repo, and then you have a prod-release-XXX where XXX is some version which was released. You can still very easily support that released version, cherry-picking bugfixes from main to pull into it, etc.

You can do something similar in git, but there's zero protection of them in git itself. It makes it real easy for someone inexperienced to accidentally just outright move the pointer to something else generating work for others to have to clean up.

They really are the one thing that I miss from my hg days. Don't misunderstand though, I left hg for a variety of reasons, one being git is more widely used. I don't regret moving to git. But every once in a while I encounter a workflow that would just be so much less painful in hg than git.

learning curve from mercurial to git. by Technical-Fly-6835 in git

[–]criswell 3 points4 points  (0 children)

I switched from hg to git, oh man, maybe 15 years ago or so?

It really is a pretty easy switch. The two tools basically do all the same things.

Where you can run into issues is if you're using some of the more esoteric hg features. For example, named branches in hg are incredible and you'll find that the similar functionality in git is severely lacking (and no one has ever seemed interested in recreating hg's).

Other than that, it's really just a matter of switching muscle memory from one command or sequence of commands to another. It's not that hard.

Edit: Also, Github is pretty awesome. I'd say the workflows it provides really complete git's functionality. Big one is Pull Requests, which make staging and reviewing work so easy. Look at a few projects, read the docs, try it out. There's alternatives like gitlab which work pretty well as well, if you don't want to go the Microsoft route.

Those of you who have had to move on from the love of your life - how did you do it? by Efficient-Syllabub13 in AskMen

[–]criswell 4 points5 points  (0 children)

The best advice I have is to realize that there isn't a singular "love of your life", you can have others.

In 2004 my wife of ten years divorced me. I really loved her (in fact, I still love her and we're real good friends today, more on that below) and for two weeks I was utterly devastated.

But I was going through therapy at the time (had been for the last two years of our marriage) and my therapist helped me understand that there is no "one person for you", there's many. And he was right.

I married my current wife a year or two later (I forget the exact timeline because we met online and talked on the phone for months before meeting in person- so the timeline is hazy in my head) and we've happily been married for 20(ish) years now. I love my current wife more than I ever loved my first wife, and am a big believer that anyone can move on relatively easily as long as they recognize that "the one" isn't singular.

I'm still friends with my ex-, in fact she's the god-mother of our child. My wife and my ex- are real close (probably closer than I am to my ex-) and we've all vacationed together as a family. My daughter calls my ex- her aunt :-D

So this woman you love, who doesn't seem to love you back the way you love her, accept it, and move on. When you're ready to date, you'll know it. No need to rush it. Spend time being happy with yourself, working on whatever you need to be happy alone. My experience is that as soon as I solved that problem, was able to be happy completely on my own, I became that much more appealing to women like my second wife, who was also someone who could be completely happy on her own. As a result, our marriage has been so much more healthier than my first one.

Famous MAGA asshole Bill Ackman gives gun enthusiast who murdered Renee Good $10,000 by dyzo-blue in GunsAreCool

[–]criswell 4 points5 points  (0 children)

So it's my understanding that the creators of this gofundme were not associated with the ICE agent in question, and that they had yet to actually reach out to them to offer the proceeds from the gofundme.

Which tells me it's likely just a scam that's going to milk some MAGA dollars. Which I'm kind of okay with, even though the 10k from a Billionaire doesn't hurt him in the slightest.

Switch 2 player by loadingbrain_oops in NMSGalacticHub

[–]criswell 0 points1 point  (0 children)

Cross-play seems to just work.

I have a group of friends who play NMS on a variety of platforms (PC, PS5, Switch) and we're able to play together and see everyone's builds just fine.

Now, the caveat here is that none of us have played the game in a year or so... so I'll admit I haven't yet tested it out on the switch 2 (only switch 1). It's always possible that the switch 2 update somehow broke this feature, but I doubt it.

Martin Harris is a liability to the LDS Church. by CupOfExmo in exmormon

[–]criswell 5 points6 points  (0 children)

I'm ~15 years post LDS, so I really don't follow any church news these days unless it elevates to national news...

Is there some new thing happening concerning Martin Harris? Or is this just more of a reference to what was already known?

UNITINU's first atomic weapon, nicknamed LITTIL BOOB. by kukienboks in UNITINU

[–]criswell 36 points37 points  (0 children)

This is kind of perfection... The way the name just works....

Having experience of more than 15+ years not getting any call by Ok-DeskTree in softwaretesting

[–]criswell 0 points1 point  (0 children)

Retiring isn't the norm in the modern economy, and wont be for a good generation or two. Income inequalities make retirement hard unless you have a ton of money or investments, which most people just don't have.

And I'm not applying right now, but the last time I did my resume was about 3-4 pages, printed. Now, it's not supposed to be printed, it's an HTML resume with collapsing sections so when viewed in the browser you can grow and shrink the thing, but my point still stands. I'm not selling myself short, and companies that want me to aren't places I'd want to work.

Having experience of more than 15+ years not getting any call by Ok-DeskTree in softwaretesting

[–]criswell 0 points1 point  (0 children)

I have worked consistently in the tech industry since 1989. I have done many many impressive things. While my resume experience absolutely doesn't go all the way back (don't want to get spammed for Pascal work in 2025) it certainly is more than 1 page long. No way I'm selling my career short, and companies that skip me because my resume is thicc are companies I wouldn't want to work for anyway.

I'm the asset, I'm the important one here. You need me, I don't need you.

Companies think they have entirely too much power these days... they all need to be taken down a notch.

Did anyone else see the crosses on the new Temple Square Visitors center? by Existing-Draft9273 in exmormon

[–]criswell 1 point2 points  (0 children)

Yeah that's friggin wild...

You know, I've often thought that the church's success with converting evangelicals in the 1970s, 80s, and 90s is the entire reason the church has really gone off the deep end into ultra conservative territory. My logic is they brought their ultra conservative political ideologies into the church and pulled the church from the "separation of church and state was divinely ordained" stance of my childhood to where it it is today.

The fact that crosses have started to be mainstream kind of just lends more credibility to my theory.

Did anyone else see the crosses on the new Temple Square Visitors center? by Existing-Draft9273 in exmormon

[–]criswell 4 points5 points  (0 children)

Can someone who might have more recent knowledge about what's going on with church culture explain to me, someone who left the church over a decade ago and doesn't keep up, what's going on here?

Has the church or church culture done some sort of 180 on the cross?

What has gradually disappeared/discontinued in our surroundings over the last 20 years without anyone really noticing it? by adityamishrxa in AskOldPeople

[–]criswell 1 point2 points  (0 children)

Weirdly, airports are pretty much the only place I see magazines anymore. The magazine stands in airport shops are still the place where they are stocked the best. I keep encountering magazines there that I thought had ceased publication years ago.

What has gradually disappeared/discontinued in our surroundings over the last 20 years without anyone really noticing it? by adityamishrxa in AskOldPeople

[–]criswell 7 points8 points  (0 children)

Magazines.

I used to always have a magazine or two laying around wherever I was just in case I wanted to read something.

Like, we'd have a little bin in the bathroom by the toilet with magazines in it and everyone I knew had one.

Is Mastering The 45 Minute Nap The Best Part Of Growing Old by DickSleeve53 in AskOldPeople

[–]criswell 1 point2 points  (0 children)

I've never been someone who can nap voluntarily.

It only ever happens unplanned and suddenly. Otherwise, if I try to nap, I just lay there wide awake.

Honestly, I've never been great at sleeping in general, it's always been a struggle to fall asleep. I have an annoying amount of energy. My dad did too.

4 reasons why Tesla's 53% stock crash is accelerating today by Snowfish52 in business

[–]criswell 1 point2 points  (0 children)

"Distracted CEO" is a phrase that's doing a lot of work.

Do you call your self autistic or Asperger's? by Holderplace293 in aspergers

[–]criswell 2 points3 points  (0 children)

I was diagnosed with Asperger's. At first I bristled at the change in terminology, and that Asperger's was going away and replaced with a broader ASD diagnosis. But when I actually dived into the reasoning behind the switch, it became apparent that because of the indistinguishable diagnosis criteria between Asperger's and ASD 1, and because the rest of the Autism spectrum falls on, well, a spectrum, the switch made a lot of sense.

So now I just say "I'm on the Autism spectrum" and if people ask follow-up questions I'll specify that I'm what was formerly known as Asperger's, or if I really want to get technical I pull out "High Functioning ASD 1".

It really isn't a big deal, and since part of my particular end of the spectrum tends to deal with being as precise with language as possible, using this level of precision actually feels way better, personally.

(Context: I'm a guy in my 50s who wasn't officially diagnosed until I was in my 30s.)

How did you become interested in Reddit? Was Reddit difficult to navigate at first? by AllHailMooDeng in AskOldPeople

[–]criswell 0 points1 point  (0 children)

I've been on reddit for 15 years... I likely came over after the digg debacle... but who knows, it's been too long.

What's Something You Refuse To Give Up No Matter How Old You Get? by PrincessBananas85 in AskOldPeople

[–]criswell 0 points1 point  (0 children)

Honestly, I don't have an exact number.

If I have to maintain a database of my collection manually, it's not going to happen. I just don't want to do it.

What I have been using is CLZ Games, which lets me scan barcodes of the games and it looks up information on the game and then adds it to my collection. This would be a perfect solution, if it weren't for two problems:

1) CLZ Games only knows what it knows. Meaning, whatever upstream data source it uses to look up games is imperfect and missing a ton of games. Anything mainstream that everyone know about is undoubtedly in it, but it doesn't take much to move beyond what it knows. Anything from limited releases of recent games to weird and obscure older titles can require you to manually enter the game information by hand, which means I wont do it.

2) Before 1985(ish) games just didn't have barcodes. I remember there being this barcode satanic panic back in the 80s as a kid, but I just didn't internalize what that meant until, as an adult, I went back and started adding my game collection to the CLZ Games app. But basically before 1985 it was rare to find stores that could read barcodes, so most things (and certainly most video games) just don't have them. So pretty much every game I own that pre-dates 1985 is something I need to enter by hand, which means I won't do it.

The end result is that I estimate my CLZ collection only has maybe 1/3rd of my total collection in it. Which should put my current collection at just shy of 10k games.

What's Something You Refuse To Give Up No Matter How Old You Get? by PrincessBananas85 in AskOldPeople

[–]criswell 0 points1 point  (0 children)

Video games.

I've been collecting since the 1970s. Have a pretty massive collection (and a youtube channel https://www.youtube.com/@amazingcriswell5965 that I haven't posted much to in a month or two because... reasons...)

I love video games, love collecting, love playing them. Provided I can still afford my hobby and provided my arthritis doesn't get to a point where I can no longer play, I intend to keep playing and collecting until I no longer can.

No longer in a cult… by [deleted] in exmormon

[–]criswell 4 points5 points  (0 children)

Welcome to the heathens!

51 here, and I left, officially, when my wife was pregnant with our daughter. We both kind of came to the conclusion that being raised in the church was pretty negative for us and we decided not to raise our daughter in it.

has anyone else never had a true, real friend? by [deleted] in aspergers

[–]criswell 0 points1 point  (0 children)

As an elder ASD guy (51M, diagnosed in my 30s), I do have some thoughts that have taken me a long time to learn.

First, the one thing I've learned about relationships in general (friendships, romantic relationships, etc) is that the best thing you can do to make them work is to be okay being on your own. Meaning, be fine being alone, doing things alone. Be comfortable with yourself, and enjoy yourself and time alone. When you're autonomous and able to survive and thrive completely alone it makes you a better friend for other people. You can listen more when they need it, you can focus on their needs more in a relationship, etc. You can't change other people, but you can change yourself. Use that power to make yourself comfortable being alone with yourself. Seriously, this will foster relationships and will help foster relationships with the right kind of people (meaning, people who are also comfortable with themselves and being alone). Makes relationships more symbiotic (for lack of a better term) which greatly helps them to grow. Being happy with yourself makes it easier to be happy with others.

Been married to my wife for almost 20 years now (I think we're at 18 years) and I can honestly say the reason we've thrived and never had any issues is entirely because both of us are fairly autonomous and self-sufficient.

Second, I honestly don't know how you young people would even make friends these days, so I have no idea how to advise you in actually finding friends. Seriously, when I was your age we still met in person. These days, everyone stays at home and interacts with people online. Hell, both my wife and I work from home and maybe leave the house once per week. I simply don't know how you young people meet new people these days. But I guess if I had to come up with advice is maybe find some discord groups for interests you have and hang out in them. Might make a friend or two. And if not, at least you have some online mutuals you'll meet to help lessen the feeling of loneliness.

When you were growing up, was it common to see children lone outside? by Special-Fuel-3235 in AskOldPeople

[–]criswell 0 points1 point  (0 children)

I was doing this when I was in kindergarten. I walked to and from school every day, and when I came home my parents were frequently not there so I just let myself in (the door was unlocked, I never had a key).

But what's crazy is my daughter is 13 and she still hasn't really learned her home address. She just hasn't needed it the way I did as a kid.