Merge Divergent Tox

Merge or compare two divergent TouchDesigner .tox/.toe binaries that git cannot three-way-merge. Load when a merge/rebase conflicts on a .tox or .toe, when asked to merge, port, reconcile, or diff two versions of a TD component, or when comparing a component across branches, machines, or TD builds.

dylanroscover Updated 219 repo stars
Embot, Embody's mascot, hovering, blinking, and waving

File contents

dylanroscover/embody commit fc7faa2574

Frequently asked questions

npx get-skill add dylanroscover/merge-divergent-tox