git How to resolve a Git “CONFLICT (modify/delete)”? 本地执行composer删除了一些文件导致线上git pull 的时候出现冲突:https://stackoverflow.com/questions/48288670/how-to-resolve-a-git-conflict-modify-delete