English 中文(简体)
未能从Gite
原标题:Failing to pull latest source from Git
  • 时间:2011-03-10 11:16:30
  •  标签:
  • git

这是我得到的信息:

" It seems that I cannot create a rebase-apply directory, and I wonder if you are in the middle of patch application or another rebase. If that is not the case, please rm -fr /Users/tom/Documents/Source/mediaplayer2 copy/.git/rebase-apply and run me again. I am stopping in case you still have something valuable there."

The only thing I did prior was to stage and commit. Don t think I rebased anything.

我如何确定这一点? 我已经过几次。

Thanks

最佳回答

如果您确实填写了<代码>git rebase,该编码即告失败(有冲突),而且你在解决冲突后没有填写“密码>git rebase-continue,也没有打上“密码>。 如果你通过其他手段(如<代码>git reset或某种)收回,则该数据库仍然开放,但大多数业务与它没有任何关系,因此它们没有抱怨。

问题回答

暂无回答




相关问题
git confusion - cloning a repo is returning a past version

Im having some confusion with my git usage. I cloned a repo from one comp to the other, and the new clone is the state of the original that was active some time ago. So its cloning a past version. ...

Appropriate strategy for tagging and hotfixing with git

I was wondering if the strategy I m using for tagging and hotfixing tags (which then I use for deploying rails applications) with git is appropriate. For tagging I just tag a commit of the master ...

Tips on upgrading CVS to git/hg?

We still use CVS, I use git and hg for my personal use though I m still a novice at both, but I realize they re much more modern and better, faster, distributed, etc. It s just everyone is so ...

Using Git in a TFS shop

Using Git at home has spoiled me - I now find using TFS at work to be a bit of a drag and want to explore the possibility of using Git locally and syncing somehow with TFS. I figure there are a few ...

热门标签