chr86
Re:Beej's Guide to Git
on Friday February 07, 2025 @05:16PM (#42978137)
Ok, so unless I'm missing something, this is a big error.
In 9.4 there's no way reallinux/master points to same commit as master after the merge. It will still be where it was, one commit behind.
Re:Beej's Guide to Git
on Friday February 07, 2025 @11:12AM (#42974297)
Hey great work beej! I've read pro git and your guide is very good.
So in figure 5.4 you say we merge 2 commits into a new one and somehow both branches point to new commit. This will definitely confuse people new to git.
I'd say it's better to write we merge anotherBranch into someBranch and leave the former where it is. Same for the next merge.
Just a suggestion
Re:From the Bretton Woods system to global stagnation [pdf]
on Sunday December 08, 2024 @02:18AM (#42355552)
I believe the user is referring to the iPhone here.
Re:Apple macOS 15 Sequoia is officially Unix
on Saturday October 12, 2024 @11:52PM (#41825033)
For me it's the fact that options cannot come at the end, eg this "rm somedir -r" which I always do (habit) works only with gnu version of cmds.
Re:GCC Adopts a Code of Conduct
on Thursday June 22, 2023 @12:50PM (#36435083)
On my work's slack, we have a bot that says (I'm paraphrasing) "please use folks, as guys is exclusionary/gendered etc".
Re:How to Clear 500k Feral Cats from New York’s Streets
on Friday June 09, 2023 @02:26AM (#36254049)
Bring in the lions!
Re:The War on Dogs
on Friday June 09, 2023 @02:22AM (#36254022)
Stray dogs are a pretty common sight in Greek streets. Although what's truly wild is the number of stray cats, especially in the suburbs!
Re:Do We Need Copyright?
on Sunday June 04, 2023 @11:49PM (#36192027)
Note what beej said, he didn't say anything about putting his own name on the books. Only that he'd sell them and pocket the money
Re:How bad is QWERTY, really? A review of the literature, such as it is
on Saturday January 22, 2022 @11:15AM (#30037910)
Myself, I had already switched to Colemak when I developed RSI due to heavy typing at my work. What did it for me was the unnatural position of my hands, wrists bent upwards and outwards in order to fit onto the "tiny" laptop keyboard.
The solution was simply to switch to a run-of-the-mill ergonomic keyboard (ERGO K860) and surprise, surprise, my RSI lessened and eventually disappeared in 2 weeks or so.
So, for me it was definitely the hand posture, NOT the layout that caused the problems!