strideram Posted March 4, 2014 Report Share Posted March 4, 2014 I gave a C# project for which I am using Git for source control. The following is the relevant section from my .gitconfig [mergetool] keepBackup = false prompt = false [merge] tool = semanticmerge [diff] tool = semanticmerge [difftool] prompt = false [difftool "semanticmerge"] cmd = <path_to_app_data_local>/PlasticSCM4/semanticmerge/semanticmergetool.exe -s \"$LOCAL\" -d \"$REMOTE\" [mergetool "semanticmerge"] trustExitCode = true cmd = <path_to_app_data_local>/PlasticSCM4/semanticmerge/semanticmergetool.exe -d \"$LOCAL\" -s \"$REMOTE\" -b \"$BASE\" -r \"$MERGED\" -a When there are merge conflicts in files not supported my SemanticMerge, like .js or .csproj, SemanticMerge warns me about the language not being supported. It then opens the text merge tool. I resolve the conflicts. I save the changes and close the tool. However Git immediately complains that the mergetool didn't resolve any conflict and asks me whether I should proceed with merging the remaining conflicted files. Why doesn't Git recognise that I have resolved all conflicts? Link to comment Share on other sites More sharing options...
calbzam Posted March 6, 2014 Report Share Posted March 6, 2014 Hi, We have reproduced the issue. It actually happens when using the text merge tool we provide: "mergetool.exe". We are performing the fix and it will be released very soon. Regards, Carlos Link to comment Share on other sites More sharing options...
calbzam Posted March 6, 2014 Report Share Posted March 6, 2014 The new release has been published. Please, upgrade Regards, Carlos Link to comment Share on other sites More sharing options...
strideram Posted March 7, 2014 Author Report Share Posted March 7, 2014 Yeah, its working now Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.