Egit - 现在无法结帐 - 停留在rebase状态 [英] Egit - Cannot checkout now - stuck in rebase state

问题描述

前几天我问过类似的问题，但我没有得到一个有用的答案，所以我想让一切更准确。

我有一个很大的项目作为github的私人回购。我和我的一个朋友正在做这件事。我将整个回购进口到本地仓库，并进入日食，一切顺利，直到合并冲突出现。每次我收到一个合并冲突（例如，当我在经常使用的类中工作之前我忘记了），我的eclipse工作空间中的整个项目就会转换成一个状态Rebase w / merge：

现在我得到了合并冲突的标记。所以我打开了类与合并工具进行合并，编辑了我不得不修改的所有内容，并将该类添加到索引中。

接下来，我提交了所有合并更改并将其推送一切到上游进入主分支（我们只使用master到目前为止，因为我们都没有很多git和vcs / svn的经验）。

但现在，我也不能切换回主分支，也不能取消rebase或做任何其他事情。

我试过：

右键单击项目文件夹 - >团队 - >切换到 - >主。

这是错误通知。

下一页我被告知要取消Git Repositories视图中的rebase：

但是我的本地回购站和远程站点都没有与rebase有关的任何选项。

接下来，我在本地分支菜单的菜单中尝试了checkout。相同的结果。
我也试图把我的本地分支推到上游：

这是我的merge / rebase选项的预设，但是这两个选项都会产生相同的结果：

我在github中查看了我的回购 - 我的所有更改（包括合并解决方案）都已经被推入主分支，并准备提取。我的队友可以拉他们，并可以继续工作。但我无法逃避这个Rebase w / merge状态。每当这个状态出现时，我不得不删除所有项目资源，删除本地存储库，将所有内容重新导入到eclipse中，最后，我必须重复执行所有其他配置。

那么，我该如何避免这个rebase？和btw：rebase和合并之间有什么区别？

解决方案

在 Git Staging 查看有一个选项可以中止rebase。

I asked a similar question a few days ago, but I did not get a helpful answer, so I want to make everything more precise.

I have a big project as a private repo on github. A friend of mine and me are currently working on it. I imported the whole repo into a local repository and into eclipse and everything went fine, until the merging conflicts came up. Everytime, I get a merging conflict (e.g. when I forget to pull before working on often used classes), the whole project in my eclipse workspaces switches into a state "Rebase w/merge":

Now I get marks were the merge conflicts came up. So I opened the class to merge with the merge tool, edited everything I had to change and added the class to index again.

Next, I commited all merging changes and pushed everything to the upstream into master-branch (we only use master so far, because we both do not have much experience with git and vcs/svn).

But now, I neither can switch back to master branch, nor cancel rebase or do anything else.

I tried:

Rightclick on project folder -> Team -> Switch To -> master.

That is the error notification.

Next I was told to cancel the rebase in Git Repositories View:

But neither my local repo nor the remote one has any option related to rebasing.

Next I tried "checkout" in the menu of the local branch. Same result. I also tried to push my local branch into the upstream:

This is my preset of the merge/rebase option, but both of those options bring up the same result:

I looked into my repo in github - all of my changes including the merge resolve are already pushed into the master branch and are ready to fetch. My teammate can pull them and can continue working on the project. But I cannot escape this Rebase w/merge state. Everytime this state came up, I had to delete all project resources, delete the local repository, re-import everything into eclipse and finally, I had to do every additional configuration over and over again.

So: How can I escape this rebase? And btw: What is the difference between rebase and merging?

解决方案

In Git Staging view there is an option to abort rebase.

这篇关于Egit - 现在无法结帐 - 停留在rebase状态的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！