2 ms·How does diffing and conflict resolution work?by solardev 3y agoHow does diffing and conflict resolution work?jcparkyn 3y ago[Not the person you're replying to] Vscode has a built-in (and quite good) 3-way merge editor, and an excellent editable diff view. GitLens also makes it easy to diff any two refs within vscode.solardev 3y agoThanks!