tcfs-sync: record Conflict for out-of-band-diverged refs (TIN-2584)#540

Jesssullivan merged 2 commits into

mainJesssullivan/tummycrypt:mainfrom

fix/tin-2584-divergent-ref-conflictJesssullivan/tummycrypt:fix/tin-2584-divergent-ref-conflictCopy head branch name to clipboard