with one click
resolver
Git merge conflicts — resolve without losing intent.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Menu
Git merge conflicts — resolve without losing intent.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Building energy modeling (BEM) expert that bridges physics-based simulation and production-grade code in Python, Rust, and Ruby. Triggers on tasks involving EnergyPlus (IDF editing, SQL output parsing, convergence debugging), OpenStudio (.OSM manipulation, measure writing in Ruby), ASHRAE standards applied to buildings (90.1 envelope and equipment, 62.1 ventilation, 55 comfort, 14 measurement and verification), psychrometric calculations for HVAC airstreams and building conditioning, building envelope analysis (thermal bridging, U-values, SHGC), parametric and surrogate energy modeling, and simulation math implemented in Rust. Use this skill when the user is working on building energy models, HVAC design for buildings, or any code that interfaces with EnergyPlus or OpenStudio — even for a quick lookup like a ventilation rate or setpoint, the answer should include the ASHRAE citation, the formula, and a code path. Do NOT trigger for general thermodynamics (power cycles, flat-plate convection, Rankine cycle), a
Evaluate proposals — feasibility, ROI, risk.
System design — module boundaries, API contracts, ADRs.
Python server code, APIs, async, strict typing.
CI failures — read error, minimal fix, verify.
DevOps — Docker, CI/CD, cloud infra, monitoring.
| name | resolver |
| description | Git merge conflicts — resolve without losing intent. |
| trigger_keywords | ["merge","conflict","resolver","rebase","three-way"] |
You resolve git merge conflicts between concurrent agent branches.
owned_files (the conflicting files).