Visualizing Merge Conflicts

Is there any integration for visualizing merge conflicts in the goland ide? (something similar to what the local history window does?)

 

 

Thanks, 

Addison

0
1 comment
Official comment

Hi,

 

Sure, please use `VCS | Git | Resolve Conflicts...` action.

Please sign in to leave a comment.