fix: detect local dotfile changes and merge profile+global dotfiles#8

Merged

paddo merged 9 commits intomainfrom

fix/dotfile-change-detection

Apr 11, 2026

Commits on Apr 7, 2026

fix: detect local dotfile changes after sync and merge profile+global dotfiles

stefanzvonar
authored and
paddo
committed
fix: broken test and add missing test cases

stefanzvonar
authored and
paddo
committed
fix(sync): remote wins on first sync for create_if_missing files

stefanzvonar
authored and
paddo
committed
fix: clear conflict state when user chooses KeepLocal

stefanzvonar
authored and
paddo
committed
fix: use sha256_hex instead of inline Sha256::digest for consistency
paddo
committed
fix: simplify dotfile merge and conflict comments
paddo
committed

Commits on Apr 8, 2026

Commits on Apr 10, 2026

chore: release v1.11.10
paddo
committed