skysight-inc/HackerNews huggingface dataset:
`git merge` is for regular people who are measured by how much they can accomplish in a given timeframe.

`git rebase` is for academics and startups where no one gives a fuck about anything and no one bats an eye if you waste a day or two on a rebase gone wrong.

It's easy to undo a merge and a bit nasty if you already pushed the merge commit. But undoing a rebase? Oh god you're in for a lot of pain.
Conversely, it's an exceptional way of getting a highly engaging discussion. It's meant to elicit an emotional reaction and get people to read their article. I don't think they made any convincing arguments to actually deprecate the command, but highlights the complexity of a command that thousands of people issue on a daily basis without thinking about it.
ahh, Democracy...
> … the only way to really understand deeply how git checkout works, you have to fundamentally understand the internal workings of git.

This is, and always has been, the primary UX problem with git. You use commands to manipulate the program’s model of the data, rather than to demonstrate your intent. It works only as long as your mental model of git matches git itself, but it doesn’t easily afford abstraction, and abstraction is the essence of efficient manipulation.

Put another way, a good tool allows you to use it well even if you don’t understand how it works. Git OTOH will quickly punish you for not understanding its model of the world.

A good UX for git would maintain the complexity for experts and provide a clear and simple surface area for most people who just want to perform familiar tasks. The fact that each person and team seems to have a unique incantation just for everyday tasks is an awful smell, and a sign of git’s immaturity.
Precisely. As humans, we use our senses to discover what is true and to what degree. When online, there's always a reality distortion machine running; the question is how much distortion is taking place
Now if git stash would support only stashing one specific file...
This is the opposite of my strategy: each wall wart in my box gets a legible label with voltage and ampacity. Eg 9V 200mA, 12V 500mA, etc. Each device gets a corresponding legible label with its required voltage and maximum current.

Then it's just a matter of picking out one that's adequate for the selected device, it's a many-to-many mapping with lots of valid solutions, not one-to-one.
Probably, but I already didn't like FB. I was just doing it as a checkbox to say we were on FB too. Once they were actively hostile to me it was no longer worth it. As a matter of course, I try not to interact with hostile people or companies if I can help it.
It ends up being a worthwhile thing to do if someone has checked in a large file that shouldn't be in git or whatever
To sum it up in one sentence: You don't need to explain words that I can look up in a dictionary, unless you are commenting on that explanation. I know what the word "joke" means but you are forcing me to either read the definition or look for where you continue your comment. It's also slightly demeaning since I can read this as "you don't know what the word joke is, let me explain it to you". You do this again for the words formula, garden and absurdity. If you really need to give extra details to a word that you are using, you can do it in brackets (like this) or with a footnote [1].

The definitions of the words formula and garden also seem out of place because they don't add anything to what you were saying -- at least I don't see any analogies that would make the joke funnier.

[1] Like this.
750+ Tailwind Components Inspired by shadcn/UI
Thanks a lot. I am in France though (should have said in the main text), and I don't think there's any fancy trial going on in France currently. Hopefully your comment can help someone else !
One example from yesterday of “what can’t be said”:

https://news.ycombinator.com/item?id=42630197

or

https://news.ycombinator.com/item?id=42630067

Or let’s say, it technically can be said, but you get somehow punished (flagged, downvoted, etc) so you learn not to do it anymore. The incentive is simply not there.

There is a logic, the “community” flags to protect their own interests (financial investments, friends working there, etc).

And since the community is from the same group, they defend the same interests.

The more freely we can talk about a topic, the more genuine and thought-provoking interactions it can create (without intentionally hurting the others obviously).

If you filter too much, you get this LinkedIn-bullshit and it makes a message board super boring, as you live in a closed bubble.
You can consult a lawyer without having the lawyer engage with the university, and without the unviversity even knowing that you did.

Instead of taking your advice on the matter, maybe see what the lawyer has to say.
> got asked for ID and then was banned with no appeal possible

This is exactly what happened to me as well.
They probably did the ruse, and it worked. The king lived. From that point on, it was a tried and tested solution.
What else will they find out, that sugar is sweet?
That's a good one! I'll add this, so it's easier to "see it in action" without watching the demo right away! Thanks a lot!
can we communally deprecate using monospaced fonts with full browser width content blocks for free form text?
I think it's the other way around. GUIs that expose everything of Git to the end developer also expose a lot of ways to shoot yourself in the foot if you don't know what the fuck you are doing.

The times I had to assist people shooting themselves with whatever favorite GUI they use... man I was happy I'm firmly in the Git CLI camp.
Second this. It do a great job explaining how the WW2 armament buildup required both legislative and mindset changes on behalf of the government about what a good working relationship between business and government looked like.

10/10 book.
You're welcome. I read a lot about fasting and I have a lot of experience with it. It's helped me, personally, heal many things (but not all of them -- it's good to have low expectations.) In any case, it's a mind-expanding experience to go without food for a while, regardless of the outcome.
Looking for a Government Job?
We are building a job board for job seekers to directly connect with government contractors.
Problem: these contractor names usually get buried with thousands of other job postings/listings and they have to known through word of mouth. There are hundreds of contractors out there (non-private sector ones) and our platform will make it easy to search, apply, and network with government contractors.
IF INTERESTED, please join the waitlist by clicking "explore jobs" on the site.
Rebase rewrites history to an extent. What I do (and this is also the advice in Pro Git for what thats worth) is use rebase when I'm working in local because its cleaner, but the moment anything ends up on GitHub, I use merge because I don't want to rewrite history that other people are aware of.

I am fine rewriting my own history on local because I know what I did, but not when its on GitHub because other people don't neccecarily know what I did.
Thanks, added all this. Send me your thoughts (will at fellowry dot com)
As the article explains, the problem with this attitude is that Git is increasingly used by people who aren't software engineers and don't want to be.

(Also, tools for software engineers still benefit from clarity and focus of purpose for simple use cases.)
It's bimodal. Most of the world uses one paradigm of programming (declarative programming via Excel and SQL), while developers use another paradigm (imperative programming via Python/C/C++/Javascript et al.).
Not bad advice, but the ask was for books - do you have any?
Rather like connections in life maybe.

All I see is blonde, redhead...
I recently discovered that their energy transition policy goes back to 10th 5 year plan (2001-2005). I think though a lit of focus was then transitioning from coal to natural gas and nuclear, which isn't surprising. What is interesting is they odentified PV and wind energy as key technologies for future to de-caebonize. 5 years later, with 11th 5 year plan they have made reducing energy intensity and emissions by 20% a binding target, which was binding for everyone including the higher ups and lowest level of government employees. This made a lot of funds availabile for these projects and R&D. They went beyond the target. Currently they have a massive edge to the West, because contemporary capitalism focuses heavily on quarterly earnings rather than lobger term goals. So there are two systems competing and optimizing for different metrics.
I felt that way about the master to main debacle, but some angry people online won anyway.
The us military is also too professional to consider following orders to attack Canada. They would not accept the risk and reputational damage that would come with breaking the NATO treaties and undermining the general security of the west.
the old commits are still in your reflog, and if they belong to a branch that isn't only on your machine, you can nag a coworker if you don't know how to use that
I think the means are ethical, as well as the ends.

At the end of the day, I dont think each of the things you said are true. I dont think there is wage competition, I dont think the state is setting sentences based on labor demands, and I dont think there is an impact to locations of habitation.
maybe borrow from Dwight? https://vlipsy.com/vlip/the-office-dwights-speech-bmeKIvGK

Seriously, I've had/have similar issues. Seems like maybe you don't project credibility within your groups? No fault of your own. Other commenters have touched on this but people really like to talk about themselves. A skill that I've tried to hone is going into "talk show" mode where I'm the host and I ask light, easy (and hopefully interesting) questions of someone else relative to what they are discussing. After doing this a bit, sometimes you can work your way into participating in the conversations in other ways. Like talking about your experience. It's not fair and I feel for you.
> But we realise that capacitors cost a few cents each and aren’t really required on stable grid supplies.

The type that can do this also fail at a rate that depends on temperature. Which is why they shouldn't use them internally. If you truly need to condition your power than you need to do it separately as almost no one shares in this problem and would not be benefited by adding these degradable parts.
One of the disadvantages of rebase is that it leads to a history where most of the commit have never existed in that exact form an any machine and so have never been built or run. This may interfere negatively with git bisect, which assumes that you can run and test the software at every commit. A squash and rebase workflow doesn't suffer from this problem, but then you end up with huge commits that may make it hard to pinpoint the exact change that causes a new misbehaviour.

Of course, having a merge based workflow doesn't guarantee that people only commit source that runs, so bisect might be broken anyway, and you get a messy history on top of that, unlike the beautiful clean line of a rebase based workflow, that makes it look like the system was developed by people of superhuman mental clarity.
I'm afraid I have no idea - I've never needed to use `git bisect`.
Ants best humans at test of collective intelligence
The trouble was that it was quite unclear to a researcher, even in one of the research council networking hubs, how to get access to the gateway, and it may have cost. I gave up trying before going to work in Oak Ridge for the summer (where I was taken aback by the primitive computing, at least "outside the fence"). For some time (mid-80s to early 90s? I don't remember) we were generally dependent on the infamous BITNET email gateway to communicate with the rest of the world from the well-developed UK network. It was "interesting" to deal with code in a Swedish 6-bit character set sent through the EBCDIC gateway to ISO 646-GB. (The Fortran Hollerith formats were added interest...)
I think a lot of the people who use merge do so because that’s what they learned initially.

Anecdotally, a lot of my coworkers who use merge are conceptually trying to stack their commits on top of previous ones. My lukewarm take: most of the time, rebase is actually the intended operation and merge is used as a hammer.
> Thank you for your comment, I thought that there's nobody left here who understands this.

Dude, plenty of people understand that. However, it's no good playing the circular pass-the-buck game, where the insurance apologists blame the doctors for everything, then the doctor-apologists blame the insurers for everything, everyone blaming someone else for everything, ad nauseam; with the end-result of the status-quo being defended by mentally exhausting everyone.
Well, since the author is sharing their pet peeve, I'll share mine and it's unrelated to Git: People that post XKCD without the title text!
> But undoing a rebase? Oh god you're in for a lot of pain.

It's actually pretty easy. You either make a checkpoint tag before you start the rebase, and reset to it if you notice something went wrong; or, if you forgot to make the checkpoint, check the reflog and find the commit you started from, and reset to that.

Reflog has a flag which adds timestamps to every entry, which I find is helpful for this:

git reflog --date=iso
> a favor and explain why you disagree

Unrealistic request. 95% of the point of downvoting is to give people the option to do their bit to bury things that they can't logically refute or easily debunk or whatever. The other 5% is spam/troll mitigation.
yeah, totally agree, it's so hard to type `git rebase --abort` (?)
anyone tried this? is this actually overall better than xgboost/catboost?
I think the state should subsidize insurance for an issue their negligence and political tribalism have allowed to reach predictably disastrous levels. I don't think that the cost of the home should be a factor, the homeowner played no role in the aforementioned disaster unless it's a policy they voted for. I would be personally shocked if "forestry" was at the top of many voter's issue list, more likely those policies just came along as a package with others.

It's also worth saying that in your 3 scenarios the outcomes are:

1. Fires still start there because the conditions which cause those fires have little, if anything, to do with the presence of that construction. Said fires would move far more rapidly through the usual untended scrub brush than it does through large, built-up areas. Now you have the same fire problem, but in a slightly different area.

2. That seems like a recipe to make it into even more of an exclusive enclave for the super-rich. Who else can afford to eat that sort of risk, shrug, and rebuild?

3. Then we're back at the start, where the negligent policies of a series of state governments produces a terrible outcome for homeowners who are not the cause of the problem.

I propose a more functional response: Let the state pay for its mistake, and require that they follow the plans of states like Oregon, Texas, and Florida, and use controlled burns appropriately! They'll be incentivized to do so as a means to keep their liability to fire insurance down, and as a bonus homeowners won't have to live through cycles of being burned out and returning.

And again, just because THIS time the fire primarily impacted the rich, doesn't mean that's how it always has been or will be.
There's nothing special about the transformer in SMPS other than it's size which is due to the high frequency.

The other problem they create, then, is high frequency noise which must be filtered out. Some cheaper adapters just dump the noise back into the mains and cause problems for _other_ devices.

Come to think of it there's a decent chance it's a /different/ adapter somewhere on his system that's causing the problem and not the size or capacity of the products native adapter.
Washington state (and many others, I'm assuming) have systems in place that allow high school students to take collegiate level classes in lieu of high school classes.

Done to completion, it is possible (and becoming more common) to exit high school with an Associates degree and the first 2 years of college completed.
Thank you so much for putting these heuristics into words. My only question here is that a lot of what you wrote seems like best practice from the perspective of a person within the tech industry. Outsiders might call it common sense. So if everyone knows what they 'should' be doing, then why do so few actually follow through?

One answer to that question might be character. Angela Ducksworth has a book called, "Grit". It is a lot like character study, which the OG explicitly expressed their disinterest for. My intuition is no matter how well you can describe the steps for success, success is not replicable. If true, that would explain why there are hundreds of self books, thousands of coaches, and only a handful of people who can consistently excel.

Having said that, I hesitate to say that there are only a few people in the world who are exceptional due to a constraint I would describe as "genuine article". How depressing a thought that would be.

Carpe diem! Floor the gas pedal, and see how fast you can go. Maybe you'll break all expectations and fly into space.
That's definitely compelling, but not something we have in mind for the immediate future. Let me know if you end up building something here!
None - but I imagine we'll see some of these in the future, which we ought to handle (e.g. discerning marketing functions v. practical utility)
git switch --detach
This is very good advice. Human beings tend to overlook, minimize, or just not closely examine their own failings, expecially painful and shameful ones. And then when they tell the story to others, they tend to portray themselves as victims - innocent and persecuted.

But you need to be very careful when you go from telling your friends to making public, consequential, legal moves. Contact a journalist, and they will want to find the whole story, not just your fanciful version. Involve lawyers and the same thing will happen.

Talk to a lawyer first; let them dig in and find the real story; be completely open and honest. Then see where you stand.
I think everyone needs to know the existence of git bisect. That has the side effect of improving individual commits as you'll make sure whatever functionality they implement is atomic.
Tyler Cowen – The Number One Bottleneck to AI Progress Is Humans
VPN providers can’t wait!
D guarantees that code that is an implementation of a constant-expression is evaluated at compile time.

There really is no purpose to adding a keyword.
Free AI tool to help LA wildfire victims understand their insurance policy
Not my country .. but .. I did read that the Fire Chiefs wanted more tanks but NIMBY resistance prevailed.

Fire tanks are generally "slow to fill* and "fast to empty" in relative terms - they form a local cache for rapid drawdown at rates much faster than "normal" water system draw.

There's also strong element in twitter and US news of petty critic for politic points .. "The hydrants are empty and there's no water" might be that kind of complaint, eg: "we emptied the tanks here holding the fire front back, the front has now moved, the tanks are now refilling" might well be the source of what became a damning meme "the hydrants are empty".
> [At the time of writing, the git restore command has been marked as "experimental" for at least four years.]

Honestly I have not bothered to even learn switch or restore because of these warnings. If they keep them in after five years, then the commands might be removed in the next version, because clearly there's no champion behind them pushing them forward.

And the few times I have tried to learn what they do, I have not seen any benefit over my current knowledge. So why learn something that may go away and is not trusted even five years and many many versions after deployment?
> have you ever worked with other people on the same project? or Gerrit?
There's really nothing simple, quick or logical about Git when you need to do things like:

Yes, I currently manage my team's merge process and review all code that gets merged into our main repository. I tend to only do trunk-based repositories, work mostly in infrastructure, so I imagine my process is a little different than some traditional "dev" ones, but it's largely uncomplicated on my 5 person team.

> copy some files from another repo into yours while preserving file history

I'm not really sure what this means - I don't often have to do this, can't imagine why I would have to do this. If by "file history" you mean the commits on the file from the other repo? I can't imagine why I'd do that and it sounds like an anti pattern to me, and I avoid doing things like that at all costs, or would just create a git submodule if I really, really had to have that history and file in my repo for whatever reason.

> copying files within a repo while preserving file history (if you just copy+paste you lose, if you edit the files after moving with git mv, but before comitting the move first, you lose all history)

Really never have felt a need for doing this in any repository I've worked in so I guess no, for similar reasons as my above comment

> deleting 1 file from all commits in a repo (almost impossible without using an external non-git tool)

Why would you have to do this with any kind of frequency? If I did, and it was sufficiently complicated, I would put it in automation and write it once and call it a day.

> dealing with a rebase that was pushed that shouldn't have happened

I'm seeing now from other comments what the difference here is, I don't really ever use rebase and never have felt the need to. If I ever worked for a team where I didn't get to decide that, we had tooling that managed that part or wrote it.

> I could go on and on with examples of things that should be trivial but aren't.

I am a little curious, because some of what you wrote sounds a little bizarre to me, but I guess I'm probably in a much different domain.
Hmmm...it's like $200 cheaper now...
Thanks so much! Crawlspace is pretty sick too, as is Integuru. A lot of people have different takes here on the level of automation to leave up to the user. As a developer building for developers, I wanted to meet in the middle and build off an existing incumbent that most people are likely familiar with already
That just shows specifications. I don't see a way to _confirm_ that the device I currently have in my hands, bearing the Energy Star logo, has actually earned it.
And that's why HN is worth reading.

You randomly browse and someone tells you out of the blue that one of your favourite science fiction authors (who's also written some mainstream lit that you know about) also has a book of poetry...
Red book was particularly interesting (modulo lack of security) long before "the Grid"; it worked between various computer centres.
git stash -- filename
This isn't even the beginning of what's possible in PDFs.
You alright there, buddy? I think some grass touching might be in order.
I think that’s a fair price for a 16GB RAM Raspberry Pi 5

I wonder if this means the 16GB Pi 500 wedge computer will be $150?
Embracing a new era: kdb+ unleashed for everyone
Bayes and Occam would suggest otherwise. If you're in your 70s in the US it's likely many people you know have cancer (unrelated to COVID). Especially now, given that detection is better than ever and more people are surviving longer with cancer.
Wait. If `git bisect` is anyway identifying merge commits only (since those are the only on history), how are you supposed to get advantage of the supposedly superior smaller commits?