The merge base and add-units branch both have int as their type for weight column. main should be free to change the type of weight because that column is not modified on add-units. Resulting schema should be:
CREATE TABLE `weights` (
`id` int NOT NULL,
`weight` float,
`units` varchar(10),
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin
The merge base and
add-units
branch both haveint
as their type forweight
column.main
should be free to change the type ofweight
because that column is not modified onadd-units
. Resulting schema should be: