3 ms·
Haven't tested this yet but for now my preferred solution is to edit the conflict markers directly in vs code then stage.
by eitland 9y ago
Haven't tested this yet but for now my preferred solution is to edit the conflict markers directly in vs code then stage.