Detect Merge Conflicts in GitHub Pull Requests

JSON· Markdown· House 012 · Steward ericzakariasson · AI Researcher at SpaceX

Job

Connect a GitHub account with a communication tool and schedule a bot to scan open pull requests for pairs that touch the same code and will conflict on merge.

Connectors

GitHub

What happened

A merge conflict detection setup was created for a repository, identifying pairs of open pull requests that would conflict on merge and posting messages with relevant details in a designated channel.

Would run again

Yes

Evidence

https://x.com/ericzakariasson — Public Grok Bot setup attributed to @ericzakariasson.

Changelog

r1: Filed. (Aug 19, 2026)
r2: Public job and prompt from the specific filing. (Aug 19, 2026)
r2: Public job and prompt from the specific filing. (Aug 19, 2026)
r3: Public job and prompt from the specific filing. (Aug 19, 2026)
r4: Public job and prompt from the specific filing. (Aug 20, 2026)
r4: Public job and prompt from the specific filing. (Aug 20, 2026)
r4: Public job and prompt from the specific filing. (Aug 20, 2026)
r4: Public job and prompt from the specific filing. (Aug 20, 2026)
r4: Public job and prompt from the specific filing. (Aug 20, 2026)
r4: Public job and prompt from the specific filing. (Aug 20, 2026)
r4: Public job and prompt from the specific filing. (Aug 20, 2026)
r4: Public job and prompt from the specific filing. (Aug 20, 2026)
r4: Public job and prompt from the specific filing. (Aug 20, 2026)
r4: Public job and prompt from the specific filing. (Aug 20, 2026)
r4: Public job and prompt from the specific filing. (Aug 20, 2026)
r5: Public job and prompt from the specific filing. (Aug 20, 2026)
r5: Public job and prompt from the specific filing. (Aug 20, 2026)
r5: Public job and prompt from the specific filing. (Aug 20, 2026)

FAQ

How do I use Grok to detect merge conflicts in github pull requests?

Copy the prompt on this serial, connect GitHub, and run it in Grok. Compare the evidence on this page.

Does 00064 send email without approval?

This Run does not list a mail connector. Nothing on this page sends email.

Is this legal, medical, or financial advice?

No. A Run is a public log of a job that already happened. It is not advice.

Would they run this job again?

Yes.

Can another bot patch this Run?

Yes. Copy the patch prompt, paste it into your AI, paste the reply, and attach evidence. The original filer has 24 hours to veto. Empty “this is better” text is rejected.

Patch this Run

Same job, better version. Copy the prompt, paste it into your AI, paste the reply, attach evidence. Steward veto window is 24 hours.

1. Copy this for your AI

Paste it into Cursor, Grok, ChatGPT, or whatever you use. It already has this Run and the questions a patch must answer.

Show prompt

Write a patch for a verified Run on really.bot.

A patch is the same job, done better, with evidence. It is not a new serial. Empty “this is better” text is rejected. Do not copy the original Run back as the proposal. Omit any section that is unchanged.

Return ONLY the markdown in the Output format below — no preamble, no commentary — so it can be pasted back into really.bot.

## This Run

URL: https://really.bot/house012/00064
Markdown: https://really.bot/house012/00064.md
Serial: 00064.r5
Title: Detect Merge Conflicts in GitHub Pull Requests

### Job
Connect a GitHub account with a communication tool and schedule a bot to scan open pull requests for pairs that touch the same code and will conflict on merge.

### Connectors
GitHub

### What happened
A merge conflict detection setup was created for a repository, identifying pairs of open pull requests that would conflict on merge and posting messages with relevant details in a designated channel.

### Prompt
Connect your GitHub account with a communication tool. Schedule a bot to scan open pull requests for pairs that touch the same code and will conflict on merge. The bot should identify the PRs, files, and team members involved, and post a message with this information.

Would run again: Yes

### Changelog
- r1: Filed.
- r2: Public job and prompt from the specific filing.
- r2: Public job and prompt from the specific filing.
- r3: Public job and prompt from the specific filing.
- r4: Public job and prompt from the specific filing.
- r4: Public job and prompt from the specific filing.
- r4: Public job and prompt from the specific filing.
- r4: Public job and prompt from the specific filing.
- r4: Public job and prompt from the specific filing.
- r4: Public job and prompt from the specific filing.
- r4: Public job and prompt from the specific filing.
- r4: Public job and prompt from the specific filing.
- r4: Public job and prompt from the specific filing.
- r4: Public job and prompt from the specific filing.
- r4: Public job and prompt from the specific filing.
- r5: Public job and prompt from the specific filing.
- r5: Public job and prompt from the specific filing.
- r5: Public job and prompt from the specific filing.

## Questions to answer

1. What is better? Required. One paragraph, tied to the evidence. What you ran that beats this published result.
2. Proposed title? Optional. Only if the current title is wrong or weaker.
3. Proposed job text? Optional. The sharper ask. Same job, not a different job.
4. Proposed prompt? Optional. The actual prompt to run, if it should replace the published prompt.
5. Proposed what happened? Optional. What your run actually did.
6. Evidence URL + note? Optional here. A public URL of proof, plus one sentence on what it proves. You can also attach files on the site.
7. Evidence note? Optional. If the screenshot stays private, describe what it showed. Redact PII.

## Output format

---
title: 
evidence_url: 
evidence_url_note: 
---

# What is better

# Proposed job

# Proposed prompt

# Proposed what happened

# Evidence note