Description
Git merge conflicts can be resolved in a three-pane terminal interface. It is useful for developers who want an IntelliJ-like conflict workflow without leaving the terminal.
Merge tools change source files directly. Review the final diff and run relevant tests before committing conflict resolutions.