Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
Discussion options

claycuy
Jun 25, 2026

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?
You must be logged in to vote

Replies: 2 comments · 1 reply

Comment options

bajrangCoder
Jun 25, 2026
Maintainer

You mean git conflicts. Right ?
If so try this, it a git client: https://acode.app/plugin/acode.plugin.version.control.gitpro
You must be logged in to vote
1 reply
@UnschooledGamer
Comment options

UnschooledGamer Jun 25, 2026
Collaborator

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

claycuy
Jun 25, 2026
Author

Okay, I'll try it! But does this still work for v1.11.8?
You must be logged in to vote
0 replies
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants
@claycuy @bajrangCoder @UnschooledGamer
Morty Proxy This is a proxified and sanitized view of the page, visit original site.