In order to "check out a branch" in jj, you would have had to run `jj new` already. So your edits won't be "added ... to the top commit of that branch", but in a new commit (revision) when you checked out the branch. Then you can use `jj split` to keep whatever changes are important and discard the debug print statements.
> any productivity improvements within that time become surplus value captured by capital.
Not quite right. Total Value remains the same before and after increase in productivity, assuming the labor force remains constant. But more use-value is created in the same period of time.
At the beginning, this is good for the employer, because the new socially necessary labor time has not been internalized, so the output can be sold for a price corresponding to its old Value. Maybe a bit less, to undercut competitors.
Eventually though, as competition adopts the new technique, everyone attempts to undercut each other’s prices, adjusting until prices correspond to the new Value.
It seems to work correctly if you include the last two lines in the first commit.
jj-workshop on HEAD (2cab0f1) [!]
> jj
@ unwquwxk samfredrickson@gmail.com 2025-07-29 18:47:18 f7db7c8a
│ Part 2 first
○ wskswvnt samfredrickson@gmail.com 2025-07-29 18:47:13 git_head() 2cab0f16
│ Part 2 second
◆ pnxpmvpz jkoppel@users.noreply.github.com 2025-07-27 21:54:50 main 4d04bcef
│ Update README.md with link to JJ homepage
~
jj-workshop on HEAD (2cab0f1) [!]
> jj show w --git
Commit ID: 2cab0f167c64cea1d23407e12196fa6d1b8aab25
Change ID: wskswvntlvtwzqutoowyqltsouklzmqr
Author : Sam Fredrickson <samfredrickson@gmail.com> (2025-07-29 18:34:52)
Committer: Sam Fredrickson <samfredrickson@gmail.com> (2025-07-29 18:47:13)
Part 2 second
diff --git a/part1/foo.txt b/part1/foo.txt
index 067f76475a..56c99c9cc3 100644
--- a/part1/foo.txt
+++ b/part1/foo.txt
@@ -6,5 +6,5 @@
* The best operating system is ______
* The best text editor is ______
-* The best kind of phone is _______
-* The best superhero is ___________
+* The best kind of phone is nothing
+* The best superhero is nobody
jj-workshop on HEAD (2cab0f1) [!]
> jj show u --git
Commit ID: f7db7c8a5f37df8c29e08a6697ca6cd59c2313c4
Change ID: unwquwxklkprlqoksmxzvoumspnmnknk
Author : Sam Fredrickson <samfredrickson@gmail.com> (2025-07-29 18:34:52)
Committer: Sam Fredrickson <samfredrickson@gmail.com> (2025-07-29 18:47:18)
Part 2 first
diff --git a/part1/foo.txt b/part1/foo.txt
index 56c99c9cc3..f48ae9b3f9 100644
--- a/part1/foo.txt
+++ b/part1/foo.txt
@@ -4,7 +4,7 @@
Maybe fill this out?
-* The best operating system is ______
-* The best text editor is ______
+* The best operating system is Linux
+* The best text editor is neovim
* The best kind of phone is nothing
* The best superhero is nobody
> Scholars tended to associate it with the theories of economists working with the Mont Pelerin Society, including Friedrich Hayek, Milton Friedman, Ludwig von Mises, and James M. Buchanan, along with politicians and policy-makers such as Margaret Thatcher, Ronald Reagan, and Alan Greenspan.
Why do you expect China’s deflation to be contagious and spread to the West? Or is there some underlying cause that both share, and it’s just that China is showing the symptoms first?
> the worlds largest manufacturer and exporter. As their prices spiral lower and lower the goods they sell abroad do the same
Eh, the deflation transmission channel for manufactured goods isn’t well established. If China had a floating currency and were a financial power, yes. But I’m sceptical cheaper consumer and intermediate goods will prompt deflation, particularly given the West is still battling inflation.
Kinetic? Which targets do you have in mind that wouldn't start an escalatory spiral between two nuclear-armed nations? _Maybe_ some of the resource extraction infrastructure the PRC has set up in foreign nations.
You also have to consider the asymmetric nature of this information. It's quite plausible that the US has its "cyber-fangs" embedded in key parts of PRC infrastructure, but how forthcoming do you think the PRC would be about that?
>>Kinetic?
Notice I put sanctions first, but considering we hardly go a week without seeing more massive CCP actions from cyberattacks to converting Chinese expats to spies, it needs to be taken seriously.
We could start with, every such attack and another major Chinese conglomerate is banned from US business. Coordinate with EU also to increase effects.
>>Which targets?
I'm not an expert in that field, but I'm sure there are many who could devise an appropriate target list. The targets you suggest are not bad, I'd certainly prioritize equipment and avoiding any human casualties, so maybe going after their power feeds and backpu to their research and data centers would be a start...
ByteDance owns TikTok, part of Reddit, and many games. Also, the CCP runs almost the entire manufacturing sector. Not just electronics, but ships.
The Xiaomi SU7 is .1 revs away from Tesla & Porsche.
The choice to sell ourselves to the CCP, for short term profit, was made decades ago by the consulting class.
The Capitalists will sell us the rope with which we will hang them
I hate the person being quoted above with all my might, but that does not make the prediction any less true.
My last hope was that the corruption of the CCP was worse than the corruption of the USA. Given the latest election, I am not so sure about that anymore.
Has your employer contributed to POTUS's inauguration, if not, please ask them to do so or else you might be unemployed! This is the CCP-level corruption bullshit. WTF.
The thing is, there is no one better at playing catch-up than the USA; e.g., in 1939 just before WWII, the US had a total of 39 tanks in it's arsenal.
The big question is, whether the incoming administration, which looks in every way like it is already owned by the authoritarian powers and aspires to join them, will fight them, or if we'll be another 4 years down before anything happens. The incoming admin is already fighting to keep TikTok in the US. Insane.
Nice, looks like a CCP-promoting downvoting brigade just showed up. All the posts critical of CCP and suggesting a response to their assault just lost a whole bunch of voted
Great confirmation that this is important. Let the downvotes begin.
I only found out about jujutsu yesterday, but from what I have gleaned, they aren't planning to remove Git compatibility. It's more that they want their own storage backend that can scale enough to handle Google's monorepo.
Seems like an overreaction. Which specific rule did revscat violate? "Don't be snarky?" "Eschew flamebait?" Because it seems to me that all they did was thoughtfully state an opinion that you had an emotional reaction towards.
The GP comment doesn't count as 'thoughtful' in any sense I recognize. What I see there is: (1) celebration of a murder; (2) denunciatory rhetoric; (3) a major assumption about what happened (in reality, none of us knows yet what happened there); and (4) a barrage of clichés ("justice has been served", "flag away", etc.).
Most people would probably say "too much." But since my cost basis is effectively $0, and I've already scaled out my position over the years during past bull runs, I'm not itching to sell. At this point it's "FU money or bust."
