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

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

    It can depend on the version of EGit you are using, and on the operation that lead to the conflict.
    See for instance bug 339092 which mention merge tool being not enabled in the case of a conflict after cherry-picking: only the just released EGit 0.12 would support that.

提交回复
热议问题