tree · dotfiles

dotfiles / ai / skills / resolve-conflicts

overview tree log ※ main → pzpllryq

..

SKILL.md jj: note push tracking limits and stale divergent copies 25 hours ago

jj: note push tracking limits and stale divergent copies

trnunkxq 25 hours ago

resolve-conflicts: cover dead commits, whole-file takes, and deletion sides

qwtnonpw 2 days ago

skills: clean up workspaces with jj workspace remove

vznywvpp 3 days ago

resolve-conflicts: cover multiple roots and silent breakage

xwntqnko 4 weeks ago

resolve-conflicts: cover symlink type conflicts in place

trynpnyx 4 weeks ago

resolve-conflicts: check the files that did not conflict

vyovoyus 2 months ago

resolve-conflicts: cover 3-sided megamerge conflicts

nuntsmyy 2 months ago

Add in-place conflict resolution to the resolve-conflicts skill

sktsnkvn 3 months ago

resolve-conflicts: note type conflicts and root anchoring

svknolvt 3 months ago

jj: split pitfalls into a reference and expand it

pqyxsvmz 3 months ago

resolve-conflicts: cover diff-style markers and conflicts in @

xppmtvrs 3 months ago

resolve-conflicts: document jj's default diff marker style

npukzuol 3 months ago

log →

quire v2026-10-27T0027-9055d90