git checkout master

结果是这样的:

Warning: you are leaving 2 commits behind, not connected to
any of your branches:

1e7822f readme
0116b5b returned to clean django

If you want to keep them by creating a new branch, this may be a good time to do so with:
git branch new_branch_name 1e7822f25e376d6a1182bb86a0adf3a774920e1e

让我们开始吧:

git merge 1e7822f25e376d6a1182bb86a0adf3a774920e1e

如果你还没有提交:

git stash
git checkout some-branch
git stash pop

如果你已经提交并且没有修改过任何内容:

git log --oneline -n1 # this will give you the SHA
git checkout some-branch
git merge ${commit-sha}

如果你已经承诺并做了额外的工作:

git stash
git log --oneline -n1 # this will give you the SHA
git checkout some-branch
git merge ${commit-sha}
git stash pop

或者，您可以设置子模块，这样就可以检出分支，而不是处于默认的分离头部状态。

编辑补充:

一种方法是在添加子模块的-b标志时检出子模块的特定分支:

git submodule add -b master <remote-repo> <path-to-add-it-to>

另一种方法是进入子模块目录，然后签出

git checkout master

我发现最好的方法是把我修改过的文件复制到一个单独的文件夹， 然后删除我电脑上现有的存储库文件夹， 然后克隆主存储库并放回文件。

另一种方式

git branch newbranch
git checkout master 
git merge newbranch 

这帮助了我

git checkout -b newbranch
git checkout master
git merge newbranch
git branch -d newbranch