Related Post: Git Extensions How To Resolve Merge Conflicts Git Resolve Merge Conflicts Using Theirs Git Best Way To Resolve Merge Conflicts