Allow updating conflict table even if the underlying table schema changed.

[nicktobey]

This is an old check from before we had schema merge. I'm convinced that it was never actually needed. This PR has the necessary changes in order to remove it.

It's important that the user is able to resolve data conflicts even if the table schema has changed, because otherwise it is not possible to manually resolve data conflicts after a schema merge.

This PR also contains some additional tests, some of which are currently disabled because of #7767 and #7762

[coffeegoddd]

@nicktobey DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
39275a6	ok	5937457

version	total_tests
39275a6	5937457

correctness_percentage
100.0

[zachmu]

LGTM

[zachmu]

Is this supposed to skipped?

It would be nice for this test to see the error, then turn autocommit off and successfully resolve the conflicts, then commit the merge

[nicktobey]

It's skipped because it triggers #7767. I added a comment explaining why its skipped.

This will probably be fixed if we get rid of column tags.

[coffeegoddd]

@nicktobey DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
a967a85	ok	5937457

version	total_tests
a967a85	5937457

correctness_percentage
100.0

[github-actions]

@coffeegoddd DOLT

test_name	detail	row_cnt	sorted	mysql_time	sql_mult	cli_mult
batching	LOAD DATA	10000	1	0.06	1.17
batching	batch sql	10000	1	0.08	1.75
batching	by line sql	10000	1	0.08	1.75
blob	1 blob	200000	1	0.89	3.91	4.45
blob	2 blobs	200000	1	0.9	4.71	5.26
blob	no blob	200000	1	0.9	2.02	2.2
col type	datetime	200000	1	0.8	2.63	2.87
col type	varchar	200000	1	0.68	2.93	2.93
config width	2 cols	200000	1	0.78	2.15	2.24
config width	32 cols	200000	1	1.87	1.74	2.56
config width	8 cols	200000	1	0.98	2	2.92
pk type	float	200000	1	0.87	1.95	2.02
pk type	int	200000	1	0.83	2.23	2.12
pk type	varchar	200000	1	1.55	1.42	1.65
row count	1.6mm	1600000	1	5.54	2.48	2.62
row count	400k	400000	1	1.43	2.35	2.48
row count	800k	800000	1	2.85	2.41	2.52
secondary index	four index	200000	1	3.55	1.27	1.1
secondary index	no secondary	200000	1	0.88	2.06	2.24
secondary index	one index	200000	1	1.13	2.1	2.18
secondary index	two index	200000	1	1.99	1.57	1.5
sorting	shuffled 1mm	1000000	0	4.88	2.56	2.71
sorting	sorted 1mm	1000000	1	4.98	2.48	2.67

[github-actions]

@coffeegoddd DOLT

name	detail	mean_mult
dolt_blame_basic	system table	1.25
dolt_blame_commit_filter	system table	3.23
dolt_commit_ancestors_commit_filter	system table	0.84
dolt_commits_commit_filter	system table	0.94
dolt_diff_log_join_from_commit	system table	2.09
dolt_diff_log_join_to_commit	system table	2.1
dolt_diff_table_from_commit_filter	system table	1.12
dolt_diff_table_to_commit_filter	system table	1.12
dolt_diffs_commit_filter	system table	1
dolt_history_commit_filter	system table	1.43
dolt_log_commit_filter	system table	0.94

[github-actions]

@coffeegoddd DOLT

name	add_cnt	delete_cnt	update_cnt	latency
adds_only	60000	0	0	0.7
adds_updates_deletes	60000	60000	60000	3.8
deletes_only	0	60000	0	1.86
updates_only	0	0	60000	2.4