nvrl 792eee75a4 feat(core,fuse,gui,cli): list and resolve sync conflicts (phase 3) ...

Conflict copies under My Files are paired with their original and listed
over the control socket. The Sync page shows them with a resolve dialog
(keep original, keep copy, keep both under a new name), and the CLI gains
`pdfs conflicts` and `pdfs conflicts resolve`. Every resolution goes
through the Proton trash, and files that are open, being written or still
owed an upload are refused.

2026-09-23 02:14:56 +02:00

..

resources

feat(core,gui): phase 1 shell — per-page headers, sidebar footer, Preferences dialog

2026-09-23 01:50:37 +02:00

src

feat(core,fuse,gui,cli): list and resolve sync conflicts (phase 3)

2026-09-23 02:14:56 +02:00

build.rs

feat(core,gui): phase 1 shell — per-page headers, sidebar footer, Preferences dialog

2026-09-23 01:50:37 +02:00

Cargo.toml

chore(deps,core,gui): upgrade dependencies to latest

2026-09-15 15:07:00 +02:00