Correctly identify which secondary indexes need to be updated during a merge#10407

nicktobey merged 4 commits intomaindolthub/dolt:mainfrom

nicktobey/merge_indexdolthub/dolt:nicktobey/merge_indexCopy head branch name to clipboard