4 ms·

Meanwhile they can’t manage to get ‘keep both’ implemented in their interactive merge conflict tool. You have to edit it by hand.