啊哈哈哈哈哈。。。对Git Merge深有同感。via SkillProgramming ​