Git - SCM - Resolving merge conflicts in the repo when doing a pull request on August 02, 2019 +0 git git