Does SmartGit have a way to do three way conflict resolution?
-
27-10-2019 - |
سؤال
Is it possible, in SmartGit, to perform a visual three way merge for conflict resolution? I know that Git Extensions can do this, and I believe TortoiseGit can do this.
I thought this would be a commonly used, and important feature, but I can't figure out how to do it in SmartGit.
المحلول
SmartGit has a built-in Conflict Solver: invoke Query|Conflict Solver on conflicting file.
لا تنتمي إلى StackOverflow