Support 3 way merge for git conflicts
Problem
IntelliJ, and all other IntelliJ-based IDE such as WebStorm, support a git merge's conflict resolution tool that it shows the conflict in three columns: - the first column for Local Changes - the third column for Changes from Server - the second column for Conflict Resolution Result Please see my attached file. I find that it's super easy for us to resolve conflict, because I can compare the Local Changes and the Server Changes on the same windows, and I can see the Resolution Result immediately. Can we please support that?
Unverified for your environment
Select your OS to check compatibility.
1 Fix
Solution: Support 3 way merge for git conflicts
This will be a super cool feature, I use `VSCode` for my day job but often resort to `WebStorm` when I need to resolve a merge conflict due to its interactivity and ease to use.
Trust Score
11 verifications
- 1
This will be a super cool feature, I use `VSCode` for my day job but often resor
This will be a super cool feature, I use `VSCode` for my day job but often resort to `WebStorm` when I need to resolve a merge conflict due to its interactivity and ease to use.
Validation
Resolved in microsoft/vscode GitHub issue #37350. Community reactions: 261 upvotes.
Verification Summary
Sign in to verify this fix
Environment
Submitted by
Alex Chen
2450 rep