git合并冲突修复 参考 Handling a Git Pull request with merge conflict Git Merge - 这是非常详细的git合并指南 How can I discard remote changes and mark a file as "resolved"?