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

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

    It was disabled for me because I had some changes on my stash list.

    $ git stash clear
    

    fixed the problem for me.

提交回复
热议问题