-
Kevin Atkinson authored
This includes no longer using an octopus merge and instead merging each branch in turn. This will also make recovering from a conflict a lot easier.
d847b7e1
This includes no longer using an octopus merge and instead merging each branch in turn. This will also make recovering from a conflict a lot easier.