Lost resolve functionality


On my mac when I do a git merge and I have conflicts the resolve window automatically pops up and I can pick either mine or theirs or merge specific lines.


On a windows machine this no longer happens,  is there a setting I am missing?  How do I get this to work on windows? I am using CMDER. On mac I use iterm3 to do the merge on the command line. 



1 comment

Do I understand correctly that you are running all git commands in terminal of IDE and resolve conflicts in 3rd party tool but now that 3rd party tool is not opened on Windows?


Please sign in to leave a comment.