Git Resolve Conflicts Using Mine