git How to resolve a Git “CONFLICT (modify/delete)”?
原文：https://www.cnblogs.com/bneglect/p/12321253.html
