您即将离开知乎，请注意您的账号和财产安全。
https://stackoverflow.com/questions/14961255/how-does-git-merge-work-in-details
