最新消息:雨落星辰是一个专注网站SEO优化、网站SEO诊断、搜索引擎研究、网络营销推广、网站策划运营及站长类的自媒体原创博客

Three-way diff between three git versions in IntelliJ - Stack Overflow

programmeradmin1浏览0评论

Does IntelliJ provide three-way diff natively (ie. without an external merge tool being configured)?

The docs have plenty of references, but none of them actually pan out:

  • Seems available only if the file you want to diff has changes: .html
  • Only if you have configured the IDE as your Git merge tool of choice and you have a merge conflict: .html#resolve-merge-conflicts-in-ij
发布评论

评论列表(0)

  1. 暂无评论