Why is the merge tool disabled in Eclipse for a EGit-managed project?

前端 未结 6 2371
醉梦人生
醉梦人生 2021-02-19 07:49

As per the EGit User Guide, to use the merge tool, one should right-click on the resource with a merge conflict and then select Team > Merge Tool

6条回答
  •  我寻月下人不归
    2021-02-19 08:13

    This also happens if you're in detached head state (in my case, I had checked out a remote branch and then forgotten).

    Also, even after you've corrected the problem, you may have to select a different project and then reselect the one you actually want (just selecting in the package explorer view) in order for the menu to update.

提交回复
热议问题