How does git resolve conflicts?

NoSuchKey

рекомендация

отblog.csdn.net/Wis57/article/details/129754370