Plugin suggestions to fix merge conflicts

[claycuy]

Whenever I encounter merge conflicts while working on PRs or personal projects, I always handle them via the CLI. But I'm curious: is there a plugin in Acode to make this easier?

Maybe something like a feature in VS Code?

[bajrangCoder]

You mean git conflicts. Right ?
If so try this, it a git client: https://acode.app/plugin/acode.plugin.version.control.gitpro

[UnschooledGamer]

Diffs are disabled for this plugin in CodeMirror 6 Versions currently.

[claycuy]

Okay, I'll try it! But does this still work for v1.11.8?