[Feature Request] Automatic Conflict Resolution and Simplified Conflict Solving Mechanism

[catnaut]

(Apologies for any language barriers; English is my second language.)

I frequently encounter Git conflicts while using Logseq across multiple devices. Currently, resolving these conflicts involves navigating to VSCode or using the terminal, which seems unnecessarily complex for what should be a simple task.

I'm wondering if there's a possibility to implement a feature that automatically recognizes conflicts and offers a streamlined resolution process, possibly with an option for automatic commit (similar to VSCode's functionality in the provided image).

This would greatly benefit users like me.

Is this feature already in the development pipeline or currently being worked on? I'd be interested in contributing to its implementation.

Thank you for considering this request.

Related: https://code.visualstudio.com/docs/sourcecontrol/overview https://github.com/Glooory/logseq-git-diff-since