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

前端 未结 6 2370
醉梦人生
醉梦人生 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:27

    It seems to be a bug in EGit as VonC mentioned, but the fix is easy. I did it using reset branch option on the same menu that Cherry Pick option existed.

    Note: git stash clear didn't help.

提交回复
热议问题