Fix merge conflicts in a jj change and its ancestors, starting from the oldest conflict. Use only in clones that use Jujutsu.
How to install fix-jj-conflicts?
firma-ai/openfirma/fix-jj-conflicts
$npx -y skills add firma-ai/openfirma --skill fix-jj-conflictsInstalls into the current project.
›Prefer a prompt? Paste this to your agent
Run `npx skills use "https://github.com/firma-ai/openfirma" --skill "firma-ai/openfirma/fix-jj-conflicts"` and follow the generated skill instructions now. Read its complete output, redirecting it to a temporary file first if necessary. Resolve relative paths from the supporting-files directory it provides.
Use the skills in "https://github.com/firma-ai/openfirma" that are relevant to the current task. Run `npx skills add "https://github.com/firma-ai/openfirma"` and select the relevant skills, then follow their instructions.
Related
6 picksType
- azure-diagnosticsDebug Azure production issues on Azure using AppLens, Azure Monitor, resource health, and safe triage.Jul 2026
- appinsights-instrumentationGuidance for instrumenting webapps with Azure Application Insights. Provides telemetry patterns, SDK setup, and configuration references.Jul 2026
- diagnosing-bugsDiagnosis loop for hard bugs and performance regressions. Use when the user says "diagnose"/"debug this", or reports something broken/throwing/failing/slow.Jul 2026
- systematic-debuggingUse when encountering any bug, test failure, or unexpected behavior, before proposing fixesJul 2026
- safe-debugRigor Debug / Rigor Audit skill for deep learning research work.Jul 2026
- golang-error-handlingIdiomatic Golang error handling — creation, wrapping with %w, errors.Is/As, errors.Join, custom error types, sentinel errors, panic/recover, the single…Jul 2026
