您即将离开知乎,请注意您的账号和财产安全。
https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git