Does SmartGit have a way to do three way conflict resolution?

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.

Answers


SmartGit has a built-in Conflict Solver: invoke Query|Conflict Solver on conflicting file.


Need Your Help

C# HttpWebRequest and Javascript based form submittion actions

c# javascript webrequest webresponse

I am trying to make a simple web crawler as a learning experience and I have hit a wall. I am able to set cookies, get cookies, and keep cookies over a session however I am now stuck when attemptin...

About UNIX Resources Network

Original, collect and organize Developers related documents, information and materials, contains jQuery, Html, CSS, MySQL, .NET, ASP.NET, SQL, objective-c, iPhone, Ruby on Rails, C, SQL Server, Ruby, Arrays, Regex, ASP.NET MVC, WPF, XML, Ajax, DataBase, and so on.