Related Post: Git Merge Conflict Resolve Using Mine Git Merge Conflict Resolve Ours Git Resolve Merge Conflicts Using Theirs