[nerdponx]

Both! I need to be able to handle merge conflicts for data, but I also need the machine to be able to apply the changes.

[konda]

You should checkout dolthub.com. It's versioned DB tool that allows for diffs and merges.