#diff3
Merge Resolver
tofilagman
IntelliJ-style 3-way merge conflict resolver — Yours | Result | Theirs side-by-side, apply non-conflicting changes in one click.
SCM Providers
#git
39
MergeForge — JetBrains-style Conflict Resolver
byte-forge
Resolve Git merge conflicts in a JetBrains/WebStorm-style three-pane visual merge editor.
SCM Providers
#git
33
5.0