Visualizing Merge Conflicts Addijhaq Created January 11, 2018 15:35 Is there any integration for visualizing merge conflicts in the goland ide? (something similar to what the local history window does?) Thanks, Addison
Hi,
Sure, please use `VCS | Git | Resolve Conflicts...` action.