Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
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.