Visualizing Merge Conflicts

Avatar
Addijhaq
创建于

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

 

 

Thanks, 

Addison

Votes

0

分享

1 条评论
Avatar
Alexander Zolotov
创建于
正式评论

Hi,

 

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

请先登录再写评论。