jj-conflicts
Help users identify, understand, and resolve conflicts in jj repositories. Use when user mentions 'conflict', 'resolve conflicts', 'merge conflict', 'conflicted commits', '2-sided conflict', or encoun
Also installable via skills CLI
npx skills add edmundmiller/dotfiles/development/jj-conflicts