有点没明白,但是感觉可能是对的。
Next question: why are you still using branches?
We talked about PRs. I don't think they make sense anymore, if you rethink them from first principles.
Yes, if you only use them to trigger CI, then sure, go ahead. That's a fat commit, not a PR. But for mandatory code review? Knowledge sharing? C'mon.
But some of you said: "we use PRs because we use branches! I love to keep my stuff on branches."
And I'm here to tell you: you don't need branches! You can just push to main.
It's called trunk-based development and the idea behind it is true continuous integration: you continuously integrate your changes with the trunk, the main branch.
It's been around for a while, it works. Just yesterday I talked with someone who said they've used it in an org with 400 engineers, without any issues. Ruby, the project, uses trunk-based development.
The main idea is that you want to avoid long-lived branches. They're bad, because branches can diverge and merging can turn into a thing. And you don't want routine operations to become a thing.
Even when I worked in teams that used PRs and branches, I considered it a smell when a branch lived for longer than a day or two.
But when I shared this with others, I'd often get something back like this:
"Well, good for you, but no. MY thing, what I'm working on, that can't be done on main. It needs to be on a branch! It has a database migration, it changes the underlying shape, the architecture, it refactors this and changes that. It can't go on main yet! I need to merge it all at the end."
And then I'd say:
"Nah, I can merge nearly anything continuously in small commits to main. You split things up. Add the column first, merge that, deploy it, now it's out, works, safe.
Add the helpers first, merge them, get them out.
Want to migrate from legacy pattern A to new pattern B? Don't do it all at once. Add the dependency, then migrate A to B, one by one, safe."
If it can be merged in a large change, I bet it can be done in small increments that you merge to main.
Yes, there are exceptions, but it's 0.5% of cases, not 50%.
But there was a real problem with this approach: it was hard!
There's a lot of "meta programming" you have to do: make sure this small first change compiles and runs and the tests work, merge it, get it out, monitor it; then do the next small piece, make sure that works and get it out; then maybe push some still-unused dead code, add a feature flag, add a config variable; or keep both configurations working at the same time, etc.
That meant sometimes it was just easier to do it in a big fat branch. But big fat branches are risky!
A system that continuously flows is safer than a system that starts and stops in spurts.
But -- you guessed it -- here's the good news:
Now, with agents, all of these chores are no chores at all!
Agents are great at adding feature flags, they're great at splitting up code, they're great at keeping track of three changes and merging them one by one and watching them roll out. They're great at keeping two configurations working for a day. They're great at migrating one by one.
In other words: it's now 10x easier to just work on main and make sure everything is continuously integrated and working.
It's now easy to make sure the system constantly flows.
And look, ...
I'm not here to convince you to switch to trunk-based development. Just a ruse to get you to read this. (But also, hey: try it! Pushing to main is amazing.)
I'm here to make you RETHINK how you develop software.
Don't just use agents to replace your typing.
Use agents as the magic code-writing machines they are. Everything that was hard about software development because it involved writing code -- even the meta programming -- has become easier.
You can now reach for the stars! But you need to look up.
Day 7 of #100DaysOfAmp
The full set is here: Mac, iPhone, iPad, and Android apps. Give them a try.
I still live in the web version.
The web can be changed. Stylus restyles fonts and layout, userscripts add features. Apps don't give me that freedom.
My font setup is one small CSS block: Agave Nerd Font first, LXGW WenKai Mono and PingFang SC as Chinese fallback. UI text changes, code font stays.
Install Stylus, new style, paste, save. Refresh ampcode.com and it has a new face.
Apps keep me posted on the go. The web is where I live. I pick the latter.
Download Stylus here: chromewebstore.google.com/de…
Day 6 of #100DaysOfAmp
Cloud orbs hit two walls on the web: blocked datacenter IPs and login screens.
With Amp Net + Browser Sync, an orb borrows your Mac's network and Chrome cookies in 3 steps:
1. Enable Settings → Experimental Features → Amp Net
2. Start your local runner:
$ amp --no-tui --runner-id my-mac --share-network --share-browser
3. Inside the orb, run:
$ amp net route my-mac
$ amp orb desktop ensure
$ amp sync browser
Your Mac becomes the exit node and your cookies drop straight into the orb's Chrome—no re-login needed.
3 sharp edges from testing:
• Google Chrome default profile only: missing Default/Cookies returns HTTP 503
• --domains only works when publishing on your Mac, not importing in the orb
• Still a Linux fingerprint: your IP and cookies, but a Linux browser—skip for strict anti-bot accounts
Day 5 of #100DaysOfAmp
When you write, what you lack is rarely a pen. It's three things: someone to ask, a book to check, and someone to review.
ASK — the question. You're stuck on whether to keep a sentence. It doesn't decide for you. It holds up two cards and waits. If you don't pick, it doesn't move.
LIBRARIAN — the lookup. You ask whether an API changed last month. It walks the shelves on GitHub: public repos, plus the private ones you've authorized, default branch only. It comes back with a long answer. It does not read your local files.
ORACLE — the review. You finish a draft and aren't sure. It reads the whole thing and circles "this has no evidence" and "these two options are the same option." It reads and never writes. Whether to change anything is still your call.
None of them write for you. They just make sure that while you write, someone is there to ask, something is there to check, and someone is there to review.
Grok Promo Code: 1 Month Free Premium (Referral)
sharecodekit.com/grok













