Warning: file_get_contents(/data/phpspider/zhask/data//catemap/2/github/3.json): failed to open stream: No such file or directory in /data/phpspider/zhask/libs/function.php on line 167

Warning: Invalid argument supplied for foreach() in /data/phpspider/zhask/libs/tag.function.php on line 1116

Notice: Undefined index: in /data/phpspider/zhask/libs/function.php on line 180

Warning: array_chunk() expects parameter 1 to be array, null given in /data/phpspider/zhask/libs/function.php on line 181
mac同步错误的git集线器_Git_Github_Github For Mac - Fatal编程技术网

mac同步错误的git集线器

mac同步错误的git集线器,git,github,github-for-mac,Git,Github,Github For Mac,我正在尝试将提交同步到我的主分支,但出现以下错误: It seems that there is already a rebase-apply directory, and I wonder if you are in the middle of another rebase. If that is the case, please try git rebase (--continue | --abort | --skip) If that is not the case, pleas

我正在尝试将提交同步到我的主分支,但出现以下错误:

It seems that there is already a rebase-apply directory, and
I wonder if you are in the middle of another rebase.  If that is the
case, please try
    git rebase (--continue | --abort | --skip)
If that is not the case, please
    rm -fr "DOCUMENT PATH/.git/rebase-apply"
and run me again.  I am stopping in case you still have something
valuable there.
 (1)

我不知道这是想告诉我什么。有人能帮忙吗?

你做了它让你做的事了吗?再基础是什么意思?我之所以选择gitHub for mac,而不是命令行,是因为我不理解命令行逻辑……请看,我没有做任何重大更改。我所要做的就是像我以前做过的数百次那样同步更改……这次可能会导致冲突。git状态怎么说?GUI很好,但Git是一个命令行工具,迟早会遇到类似的情况,所以您最好学习使用它,只使用其中的一部分。我之前链接到的那本书是一个很好的开始。