Feature: Data conflict resolution during interactive rebase

[fulghum]

When data conflicts occur during an interactive rebase, customers can now use Dolt's conflict resolution tools to resolve the conflicts and continue the rebase operation. Note that schema conflicts are not supported yet.

Example:

> select * from dolt_rebase;
+--------------+--------+----------------------------------+----------------------------+
| rebase_order | action | commit_hash                      | commit_message             |
+--------------+--------+----------------------------------+----------------------------+
| 1.00         | drop   | iumpo2t0hd6drcn11jo8osdack1jmafp | inserting row 1 on branch1 |
| 2.00         | pick   | us2uaji20dj77cnf1i2l698itr5392se | updating row 1 on branch1  |
+--------------+--------+----------------------------------+----------------------------+

> call dolt_rebase('--continue');
data conflict detected while rebasing commit us2uaji20dj77cnf1i2l698itr5392se (updating row 1 on branch1). 

Resolve the conflicts and remove them from the dolt_conflicts_<table> tables, then continue the rebase by calling dolt_rebase('--continue')

> select * from dolt_conflicts_t;
+----------------------------------+---------+---------+--------+--------+---------------+----------+----------+-----------------+------------------------+
| from_root_ish                    | base_pk | base_c1 | our_pk | our_c1 | our_diff_type | their_pk | their_c1 | their_diff_type | dolt_conflict_id       |
+----------------------------------+---------+---------+--------+--------+---------------+----------+----------+-----------------+------------------------+
| us2uaji20dj77cnf1i2l698itr5392se | 1       | one     | NULL   | NULL   | removed       | 1        | uno      | modified        | B1dLxGtGIlHRKJo88tigpw |
+----------------------------------+---------+---------+--------+--------+---------------+----------+----------+-----------------+------------------------+

> call dolt_conflicts_resolve('--theirs', 't');
+--------+
| status |
+--------+
| 0      |
+--------+

> call dolt_add('t');

> call dolt_rebase('--continue');
+--------+-----------------------------------------------------+
| status | message                                             |
+--------+-----------------------------------------------------+
| 0      | Successfully rebased and updated refs/heads/branch1 |
+--------+-----------------------------------------------------+

Customer issue: #7820

[macneale4]

There is a lot here. Rebase is complex!

[coffeegoddd]

@fulghum DOLT

comparing_percentages
100.000000 to 100.000000

version	result	total
8a49cd8	ok	5937457

version	total_tests
8a49cd8	5937457

correctness_percentage
100.0

[macneale4]

LGTM!

              |    |    |                 
             )_)  )_)  )_)              
            )___))___))___)\            
           )____)____)_____)\\
         _____|____|____|____\\\__
---------\                   /---------
  ^^^^^ ^^^^^^^^^^^^^^^^^^^^^
    ^^^^      ^^^^     ^^^    ^^
         ^^^^      ^^^