I REALLY love the way merge tool works in IntelliJ IDEA.
Is there some other tool out there that works in a similar way, and that good?
(tho, typing idea . and doing a merge fix is not that bad)
Is there some other tool out there that works in a similar way, and that good?
(tho, typing idea . and doing a merge fix is not that bad)
[mergetool "idea"]
cmd = /usr/bin/env idea merge "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
[1]: https://www.jetbrains.com/help/idea/command-line-merge-tool....
That tool is so good because it leverages the entire eco-system of IDE it is running in. The resulting merge panel is as powerful as any editor window in the IDE. It has code inspections, it detects missing imports, it does everything.
It might be the case that ripping the diff/merge tool out of the IDE would result in way inferior product than we get when we use it within the IDE.
Otherwise, yeah it's amazing!