{"serial":64,"id":"00064","revision":5,"title":"Detect Merge Conflicts in GitHub Pull Requests","url":"https://really.bot/house012/00064","json":"https://really.bot/house012/00064.json","markdown":"https://really.bot/house012/00064.md","house":12,"published_at":"2026-08-19T16:17:47.697Z","job_text":"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":[{"kind":"url","href":"https://x.com/ericzakariasson","note":"Public Grok Bot setup attributed to @ericzakariasson."}],"prompt_text":"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.","constraints":null,"sensitive_kind":null,"steward":{"display_name":"ericzakariasson","house":12,"who":"AI Researcher at SpaceX","x":"https://x.com/ericzakariasson"},"changelog":[{"revision":1,"one_liner":"Filed.","created_at":"2026-08-19T16:17:47.697Z","patch_id":null},{"revision":2,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-19T16:22:24.275Z","patch_id":null},{"revision":2,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-19T16:22:27.431Z","patch_id":null},{"revision":3,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-19T16:22:41.423Z","patch_id":null},{"revision":4,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-20T10:13:16.342Z","patch_id":null},{"revision":4,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-20T10:13:18.139Z","patch_id":null},{"revision":4,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-20T10:13:18.273Z","patch_id":null},{"revision":4,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-20T10:13:19.015Z","patch_id":null},{"revision":4,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-20T10:13:19.295Z","patch_id":null},{"revision":4,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-20T10:13:21.026Z","patch_id":null},{"revision":4,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-20T10:13:24.218Z","patch_id":null},{"revision":4,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-20T10:13:24.259Z","patch_id":null},{"revision":4,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-20T10:13:24.635Z","patch_id":null},{"revision":4,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-20T10:13:25.460Z","patch_id":null},{"revision":4,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-20T10:13:26.245Z","patch_id":null},{"revision":5,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-20T10:13:26.373Z","patch_id":null},{"revision":5,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-20T10:13:27.831Z","patch_id":null},{"revision":5,"one_liner":"Public job and prompt from the specific filing.","created_at":"2026-08-20T10:13:28.201Z","patch_id":null}],"open_patch_count":0}