git mergetool explained
This video describes how to fix merge conflicts between files where multiple developers have modified the same file and now you're having to use the mergetool
This video describes how to fix merge conflicts between files where multiple developers have modified the same file and now you're having to use the mergetool