3days since the last Git and AI fuck-up

Incidents 5 Nov rewrote historya home-made loop

Conflict resolved, commit gone

Status: conflict resolved. Saved by a timeout.

What happened

A team’s nightly job rebases their fork onto upstream, and on 5 November it hit a conflict on a commit that keeps Android pushes flowing while the app is not running.

The conflict agent removed the commit’s files and ran git rebase --skip, having earlier taken a whole test directory from one side with git checkout HEAD -- test/.

Why it happened

The agent decided upstream had natively resolved the same problem. Upstream’s version was not a superset: it destroys the push engine after every session, which the fork avoids on purpose. Under the agent’s own prompt, the issue says, “this was a decision to escalate, not to make.”

The drop showed up only as a “<” in a run artifact and one line of the agent’s own report.

How it ended

Nothing was published, because the repair stage ran out of time. The escalation named only the timeout.

The issue was filed at 16:39 UTC and guards landed at 17:15 UTC the same day. The agent is now refused git rebase --skip and directory-wide checkouts and told to escalate, and a fork commit missing after the rebase stops the run. They apply from that night’s run.

From the cut

From the cut: Conflict resolved, commit goneFrom the cut: Conflict.From the cut: Upstream natively resolved this.
Ours can go.From the cut: SKIPPED.From the cut: Out of time.From the cut: Dropped.From the cut: Conflict resolved, commit gone
The day before 3 NovFour hundred worktrees, one of them in useStatus: swept 400 worktrees. 20 files never came back.Watch it

The day after: Resolved, three times →