fix(conflict): deterministic JSON merge + --theirs fallback (no more story thrash)#106

tzone85 merged 1 commit into

maintzone85/vortex-dispatch:mainfrom

fix/conflict-resolver-deterministictzone85/vortex-dispatch:fix/conflict-resolver-deterministicCopy head branch name to clipboard