General Forums on Product Hunt

The conflict git cannot see is the one parallel agents produce

RunAI Coder · 2026-09-22T19:29:00.385-07:00

Fifteen years ago a study went back through 1,694 merges in three open-source projects with runnable test suites. 76% merged clean and stayed fine. 16% hit a textual conflict, the kind with conflict markers. And another 1% and 6% merged clean, no markers, nothing to resolve, then broke the build or failed the tests. Of all the conflicts in that study, a third were ones the VCS had reported as a clean merge.We wanted to see what it looks like with two coding agents in two git worktrees, which is what the coding CLIs' docs offer for running work in parallel. Ten times we made a base commit, gave two agents one worktree each and two tasks that never mention each other, one of which quietly depends on the other, one renaming a field the other one reads, one changing a file format the other one parses. Both agents ran the tests before finishing. All twenty worktrees were green.Git stopped five of the ten merges with conflict markers. It passed the other five as clean, and the merged tree failed the combined suite in all five. The failing tests were always the second agent's own, unchanged, green minutes earlier in its own worktree. One pair we ran twice and got both outcomes: the model placed a new block of code one line away from the other agent's edit and git merged; placed it directly below, git flagged a conflict.A merge compares hunks of each file with their common ancestor and knows nothing about callers or field names. A worktree guarantees each agent never reads the other's edits, which is exactly why the two changes first meet at the merge. Recent papers on agent PRs report 20-42% textual conflict rates, and even they admit that's just a lower bound.After the merge, what in your setup executes the combined tree, how long after the agents report done, and what has that step caught that neither agent's own run did?

p/generalShare and discuss tech, products, business, startups, or product recommendations

Start new thread

trending

•

1yr ago

How do you manage to focus on your work when so many things are falling apart?

It's a rule that when one aspect of life is going well, the others are somehow failing.

At the moment, things couldn't be better on the work front:

I have a great team, and the company is doing well.
I'm praised for the results I deliver and the progress I'm making.
My networks are growing, and there's more and more interest in my sponsorships.
More people want to work together.
And I'm co-organising 2 offline events.

•

3yr ago

Featured

Which book has had the strongest effect on how you make products? And why?

Which: "Free: The Future of a Radical Price" by Chris Anderson Why: Because it drives home the point regarding how the prices of digital services will go to zero. And how you can still make money. The freemium business model What's yours and why?

•

1yr ago

If you were to lose your job right now, what would you do?

I should probably start Monday more optimistically, but let's take it as a little creative exercise.

I see people on Reddit complaining that jobs are really hard to get. With the use of AI technologies, the situation won't be any easier.

•

2yr ago

Featured

What’s the biggest lesson you’ve learned on your startup journey so far?

Calling all founders! Share your wisdom with the community and let s inspire each other to keep pushing boundaries!

•

4yr ago

Featured

Checkout The Product Hunt Webinar: Launch Tips 🚀

Hey everyone Thank you to all the attendees of our fantastic webinar! We are delighted to have had the opportunity to share our experience with you and thrilled that so many of you found the information and discussions to be valuable You can find the answers to all these questions here

How did we decide on launching PH? What are the steps we followed before the launch? What are our strategies? Did we launch our e-book in a separate section? The importance of choosing a day What would we want to change pre and post-launch? Did we offer a special promo? Hunter and hunter kit process Emailing If we didn't work this much, how would be the effect? What is the ideal number of followers? What is the importance of the first hour? Did we embed official PH badges? How long were we active before the launch? How will we promote BeforeSunset in the future? How can we relaunch a product? The launch day Updates on social media Mailing on the launch day How did we deal with the unexpected events How did we employ each social media platform? The after-launch plan How did we build a community? Are we satisfied with the results?

•

2yr ago

Featured

From coffee shops to couches, where do you find your best work happens?

Many of us are remote workers here. Where is your go-to for your best work? Your bedroom? Office? Coffee shop? Library?

•

28d ago

Which companies do you think will survive the next 10 years, and which ones will disappear?

A few years ago, I read the book The Four by Scott Galloway.

The book, published in 2017, focused on the four companies that dominated the market at the time: Amazon, Apple, Facebook (now Meta), and Google.

•

1d ago

How do you decide which customer feedback actually becomes a roadmap item?

Every team I talk to has more feature requests than they can act on, and most of it doesn't come with clean data attached, just a support ticket or a Slack message from a customer. For those running product teams here, what's your actual process for turning scattered feedback into a prioritized roadmap? Curious whether people are doing this manually in spreadsheets, using a dedicated PM tool, or something else entirely.

•

4yr ago

Featured

What is essential for you in a productivity app/software tool?

Hey, all! There are many productivity tools out there offering different features. But I still haven't found one that covers everything I want. To me, the essential features a perfect tool must have are: - A good text editor ( I mean, I love notion. But why is it so hard to bring the text there to other formats? Sometimes I summarize some things inside notion, but taking them to an actual doc or pdf is so painful!) - Simple, minimalistic design - A good place to have random thoughts and things that I need to get done without losing sight of them - Good integrations!! I use Gcal a lot, so I would love to have a productivity software that actually integrates with it. What about you?

•

6yr ago

Featured

What are your 3 most important metrics to track?

I know there will be more than 3 but what are the most important ones for you? Bonus point if you tell me what kind of product are you working on too :)

•••

68 69 70

•••