Git Session 7 || Git Conflicts || Merge Conflicts || DiffMerge Tool || Pull Request and Local Merge
In this video will discussed how to resolve the conflicts using diffmerge tool and how to resolve conflicts when raise a pull request and how to merge the changes from source to destination branch and we have discussed how resolved the conflicts as well