3 ms·How does gitlens help with merge conflicts?by pkaye 5y agoHow does gitlens help with merge conflicts?