#conflict
Conflict Resolution Diff
kaisumi
View Git conflict resolution diffs from Visual Studio Code.
Visualization
#git
5
Merge Resolution Diff
andy-orbis
Review only the manual part of a merge commit (conflict resolutions) as native split diffs: committed result vs git's mechanical auto-merge (remerge-diff semantics).
SCM Providers
#git
3
Git Forge
AceXiamo
A compact Git history, branch status, and conflict resolver for VS Code Source Control.
SCM Providers
#git
3
GitView
gitview
See Git clearly. 3-way merge, history, branches, changes and diffs for VS Code.
Visualization
#git
1