Cannot resolve conflict using Meld tool

sourcegit-scm / sourcegit

Windows/macOS/Linux GUI client for GIT users

MIT License

1.28k stars 128 forks source link

Closed zrpfpr closed 4 days ago

zrpfpr commented 5 days ago

Hi, recently installed sourcegit and I can see that I cannot resolve a simple conflict merge using Meld, always appear this message:

If I try to resolve using VSCode, for instance, no error shown.

OS: Linux Mint 22 Sourcegit: 8.35 Git: 2.43.0 Meld: 3.22.2

Thanks for this fantastic tool BTW! Amazing features and support!

love-linger commented 5 days ago

I've pushed a commit that tries to fix this issue. You can download the latest CI build from Github Action https://github.com/sourcegit-scm/sourcegit/actions/runs/11539127971.

PS: My Linux device is not with me and I cannot test it...

Looking forward to your feedback.

love-linger commented 4 days ago

Tested. You can just download the latest release 8.36

zrpfpr commented 4 days ago

Superb! Works like a charm. Thanks for your work!! @love-linger