Message from @pandaxcentric
Discord ID: 464072346622230531
What's the equivalent documentation for `hg resolve`?
```
hg resolve [OPTION]... [FILE]...
redo merges or set/view the merge status of files```
yeaht at this point I'm just so used to git I don't even question it. We use it super basic internally - nothing fancy - and everyone preserves the rules enough we have maybe max 1 issue a year
and that issue is usually resolved by just rebuilding a branch or going through stuff with meld
git really is the C++ of the VCS world - a ton of features and everyone uses it differently so you can be a master of it and still not understand what the fuck is going on with someone elses stuff
Except good C++ programmers understand very well how it works, and they can look up quickly what they don't know. Not so much with `git`.
not sure that's true. So many features have been neglected in C++ that soemtimes it's a mystery
I had a physical copy of the C++ standard for a while to look up arcane things
As Stroustrup said, "legacy systems are systems that are known to work."
[*techie arrives*] "what seems to be the problem?"
[*points to TV, NAS and router*] "not streaming media properly, here I'll show you"
[*accidentally jury-rigs the system so it stream*]
[*techie tries to get it to stream properly for the next hours*]
[*can't fix*]
"that'll be $110"
nigga wat
I disagree with equating git to C++
when you work in a language, the more projects you do, the more you start to get a deeper understanding of the language and it's features...but with git, you can go years never needing to do more than 3 commands (pull, merge, push)
so you aren't working your way to a better understanding of what git can do, something goes wrong and you just have to panic google until it isn't going wrong anymore
I'm the git "expert" in my company, so whenever something goes wrong people come to me to figure it out, and if my bag of tricks doesn't work, it's back to panic googling lol
@pandaxcentric that's my point though. C++ has an unfathomable ammount of features and a lot of them most developers don't use or even know about.
Direct qote from Bjarn Stroustrup about the issue:
```
Even I
can’t answer every question about C++ without reference to supporting material (e.g. my own books,
online documentation, or the standard). I’m
sure that if I tried to keep all of that information in my head,
I’d become a worse programmer.
```
I bet I could pick 3 features I know of in C++ off the top of my head and you wouldn't have known one of them existed
lol, I don't code in C++ so I probably wouldn't 😛
I get your point, but I feel like developers deepen their knowledge of the languages they work in as they work in them
if you ever get the chance check the ISO C++ standard book. It's insane
I'd agree with you if this was Ruby or Python or even Java, but C++ is a totally different beast
it's crazy
haha, I work in golang, which is a beast too
I know of 5 different variable array types that are in the standard library alone
yeah, that kinda supports my point though, as you used C++ you learned about those 5
wait 6
yeah but those aren't even all of them
you'll never learn all of C++, but you'll continue to learn more about it , and learn more about how it works
right, but that's the point, same with git
unmasterable
everyone uses it a little different
multiple ways to achieve the same thing
maybe we can agree to disagree...with git, a lot of people never go beyond push, pull, checkout, merge
right, and with C++ most people don't go past STL or even up to it
I used maps like crazy in C++ recently but I'll bet 70%+ of C++ devs have never even touched them
maybe you're right, maybe I just get a lot of projects to force me to learn more about the languages I use
I assumed that was the case with most people
I'm not talking about just any languageg, I'm talking about C++ specifically
seriously if you ever get the chance check out the standards document
it's insanity