我最近开始使用GitHub for Windows。
我只是有冲突。在命令行上我会知道如何处理这个问题,但是 GitHub for Windows 选择让我处于我不熟悉的状态:
C:\Users\w\Documents\GitHub\CmisSync [(6026d18...)|REBASE +0 ~1 -0 !1 | +0 ~0 -0 !1]> git status
# Not currently on any branch.
# You are currently rebasing.
# (fix conflicts and then run "git rebase --continue")
# (use "git rebase --skip" to skip this patch)
# (use "git rebase --abort" to check out the original branch)
#
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
...
我修复了冲突,提交了文件,但是当我运行时,git push
我被告知:
fatal: You are not currently on a branch.
To push the history leading to the current (detached HEAD) state now, use
git push origin HEAD:<name-of-remote-branch>
将我的合并提交到远程主机的推荐方法是什么?
我怀疑git push origin HEAD:master
会实现这一点。