resolve-pr-conflicts
Skill1.2k starsChanged 8 days agoLicence not identifiedView on GitHub
Resolve merge conflicts in an open pull request for this repository. Use when the user says "/resolve-pr-conflicts", asks to fix PR conflicts, says a pull request cannot merge because it is behind main, asks to update a PR branch from main, or asks to make a conflicted PR testable again.
- Commits and pushes
2 other projects use a version of this, 1 of them edited.
Trending
More talk lately.about the whole repository
Most recently taken up by
- jtenniswood/espframeedited, first seen Oct 8, 2026
- jssblck/agentstheir own version, first seen Aug 27, 2026
Who's talking about jtenniswood/espcontrol
- jtenniswood/espdesktop“Sync recent EspControl settings and P4 reliability fixes”GitHub · Oct 17, 2026 · 1 reactions
- jtenniswood/espdesktop“Fix camera image fit and theme-aware margins”GitHub · Oct 10, 2026 · 1 reactions
- jtenniswood/espdesktop“Add 4.3-inch P4 V3 display support”GitHub · Oct 10, 2026 · 1 reactions
- jtenniswood/espframe“Enable runtime Home Assistant API encryption”GitHub · Aug 31, 2026 · 1 reactions
- GalusPeres/HomeTiles“Feature request: Change the status (color) of the folder.”GitHub · Aug 23, 2026 · 1 reactions
The biggest 5 of 20 mentions linking to the repository that our crawl found. Each line is their own headline.
See all 20
Talked about on GitHub (20 times).
On GitHub · 20
- Oct 17, 2026Sync recent EspControl settings and P4 reliability fixes — jtenniswood/espdesktop1 reaction · 1 comment
- Oct 10, 2026Fix camera image fit and theme-aware margins — jtenniswood/espdesktop1 reaction · 1 comment
- Oct 10, 2026Add 4.3-inch P4 V3 display support — jtenniswood/espdesktop1 reaction · 1 comment
- Aug 31, 2026Enable runtime Home Assistant API encryption — jtenniswood/espframe1 reaction · 1 comment
- Aug 23, 2026Feature request: Change the status (color) of the folder. — GalusPeres/HomeTiles1 reaction · 3 comments
15 more on GitHub
- Nov 8, 2026Card Images — jtenniswood/espdesktop0 reactions · 1 comment
- Oct 16, 2026Add support for JC4880P443 V3 (ESP32-P4 v3.x production silicon) — figamore/wled-touch-remote0 reactions · 1 comment
- Oct 10, 2026Add Light and Automatic display themes — jtenniswood/espdesktop0 reactions · 1 comment
- Sep 29, 2026JC8012P4A1: no profile for V2 panel (SKU 10153002-V2, case 2635) on pre-v3 silicon - washed-out render, magenta line, screen type Unknown — MaxGramser/homeassistant_espscreen0 reactions · 4 comments
- Sep 26, 2026GUITION JC8012P4A1 V3 not supported — MaxGramser/homeassistant_espscreen0 reactions · 23 comments
- Sep 15, 2026Similar Project, working together? — GalusPeres/HomeTiles0 reactions · 3 comments
- Sep 9, 2026Align web clock bar typography with card labels — jtenniswood/espdesktop0 reactions
- Sep 9, 2026Match Settings cards to each display grid — jtenniswood/espdesktop0 reactions
- Sep 8, 2026Move PR 1855 into EspDesktop — jtenniswood/espdesktop0 reactions · 7 comments
- Sep 2, 2026still not compiling on esphome 2026.8.2 — agillis/esphome-modular-lvgl-buttons0 reactions · 2 comments
- Sep 1, 2026Add backlight_pwm frequency — x-Felix/espcontrol0 reactions
- Aug 16, 2026JC1060P470 V2 new-panel — GalusPeres/HomeTiles0 reactions · 4 comments
- Jun 4, 2026Update GitHub repository links to ryxios/espcontrol — ryxios/espcontrol0 reactions
- May 5, 2026Update repo URLs to benJDtom fork — benJDtom/espcontrol0 reactions
- Apr 25, 2026Fork: update ESPHome configs to reference wonderslug/espcontrol — wonderslug/espcontrol0 reactions
Other versions2 projects use a version of this.
Word for word · 0
None found.
Edited · 1
- jtenniswood/espframe★ 20986% same
Wrote their own version · 1
- jssblck/agents★ 0same name
How matches are found. Word for word: the exact same text. Edited: shares passages with this file (“99% same” means 99% of its five-word phrases also appear here; 10% or more counts). Their own version: similar meaning, or, weakest, the same name. We can’t tell which project had it first. Projects are counted among the 200 most-starred candidates, and mentions are links to the repository we found, up to 50 per site, so both counts are a floor.
In this repository21 other files it gives its agents.
- AGENTS.mdAGENTS.md
- clean-complete-branchesSkill
- clean-merged-branch-foldersSkill
- compileSkill
- docs-reviewSkill
- expert-resetSkill
- Expert ReviewSkill
- flash-displaysSkill
- mergeSkill
- mock-feature-screensSkill
- post-updateSkill
- pr-reviewSkill
- prSkill
- releaseSkill
- review-allSkill
- review-onboarding-docsSkill
- tech-debt-scanSkill
- translation-auditSkill
- translationsSkill
- updatesSkill
- user-feedbackSkill
The file
Show its rules and text
We split this skill into the rules it gives an agent
20 rules. About 0 are common, 17 are distinctive, and 3 are very specific to this project.
≈0
Common · estimate
Many files like this have a rule of this kind.
≈17
Distinctive · estimate
This author's own choices. Worth a look.
3
Very specific
Tied to their project's names, files or tools. Probably skip.
The licence could not be identified — read it at the source. We count its rules but don't quote them. Read them on GitHub.
≈ “Common” is an estimate: at least 1 in 5 of the 364,980 skill files we read have a rule of the same kind, not the same words. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.
Does it work?
Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.
No reviews yet
People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.
- It worked
- Partly
- It didn't
Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.
Your trail
Files you open will collect here, so you can find them again.
Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.
Now do this for your own.
Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

