Anycode already has highlighting of the conflicts in its diff tool
It would be extremely helpful to have the ability to resolve the merge conflict in a same way like in the VS Code. VS Code's hyperlink buttons with resolve conflicts actions are really good:

Anycode already has highlighting of the conflicts in its diff tool
It would be extremely helpful to have the ability to resolve the merge conflict in a same way like in the VS Code. VS Code's hyperlink buttons with resolve conflicts actions are really good: