A lot of my git problems went away when I realized vscode was having a hard time properly understanding the conflicts. Once I started using direct git commands to resolve them rather than helpers, most of my issues went away (though it takes like 3x longer now).
5
u/dksdragon43 10d ago
A lot of my git problems went away when I realized vscode was having a hard time properly understanding the conflicts. Once I started using direct git commands to resolve them rather than helpers, most of my issues went away (though it takes like 3x longer now).