![]() The Arguments field is where the nuts & bolts of the integration happen. In the Command field, enter the location of the SemanticMerge exe on your system. If you want to restrict SemanticMerge to just C# files, you can specify this in the File Pattern area. This opens the Add conflict solver window. In the Conflict Solvers window, select Add to add a new solver. Select Conflict Solvers in the Preferences window. Configuring SmartGit to use SemanticMerge I'll describe using SemanticMerge to view changes and resolve conflicts later in this blog, after we've got it set up with our Git clients. SemanticMerge can be used with other source control systems that support three way merging, such as TFS, Mercurial and Plastic SCM. In other words, the version of the file in the branch which is having the other branch's changes merged into it. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |