tree merge with tree-related auto-resolution#1705

Merged

Byron merged 20 commits intomainfrom

Dec 8, 2024

Commits on Nov 25, 2024

fix: when binary merges are performed, adjust the returned resolution to indicate auto-resolution.
Byron
committed

Commits on Nov 27, 2024

Commits on Dec 5, 2024

Commits on Dec 6, 2024

fix: assure passwords aren't returned in percent-encoded form.
Byron
committed

Commits on Dec 8, 2024