either decline the request or merge it manually on your local system using the following commands:
git merge --no-ff -m 'Merged in development (pull request #85)' remotes/origin/development
当我的代码正常工作时,我需要查看它的状态,所以我决定使用git checkout (因为我想检查一些东西)。我就是这么做的然后我做了两个新的提交,希望它能创建新的头。它没有,相反,我得到了: Your branch and 'origin/master' have diverged,
and have 2 and(use "git pull" t