Questions tagged [meld]
Graphical application for Linux and other OSes used for viewing and merging differences between files and directories.
meld
209
questions
0
votes
0
answers
33
views
Set Meld as external diff tool in gitk - permissions error MacOS
I am trying to setup Meld as an external diff tool in gitk on macOS however I stumbled on an error when trying to open a diff.
/ Applications/Meld.app: command
failed: couldn't execute "/
...
- 334
0
votes
0
answers
45
views
Unable to Copy Changes Back Using git-difftool with Beyond Compare 4/Meld
I have been using git-difftool along with Beyond Compare 4 and Meld to review and revert changes in the working directory. While this process works smoothly for most files, I have encountered an issue ...
1
vote
1
answer
414
views
Why /usr/bin/python3: symbol lookup error on git branch comparision with difftool meld in ubuntu?
I'm trying to compare two git branches using meld, in ubuntu with following command;
git difftool -d branch123
it gives me this error instead of comparision in meld:
/usr/bin/python3: symbol lookup ...
- 375
1
vote
1
answer
416
views
how to ignore a directory in meld?
I am doing a directory comparison using Meld v3.20.4 on Ubuntu 20.04
I want to ignore a directory that looks like this
a
└── b
├── c
│ ├── c1.csv
│ ├── c2.log
│ └── c3.txt
└──...
- 1,103
0
votes
1
answer
31
views
linux svn launches meld
I'm using a shared VM, its running Fedora 20 Heisenbug. SVN is version 1.8.3
At some point meld was installed and now when running svn diff on the command line meld is automatically launched, meld is ...
- 5,578
3
votes
2
answers
1k
views
Running meld under WSL2 from the command line, I get a constant stream of errors, though it 'appears' to be working
I am running WLS2 on Windows 11. Everything is up to date.
~$ uname -a
Linux NJ-LPT-06 5.15.90.1-microsoft-standard-WSL2 #1 SMP Fri Jan 27 02:56:13 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
When I start ...
- 43
0
votes
0
answers
117
views
meld opens incorrect path to local file
recently installed meld on my macOS Catalina as mentioned here. My gitconfig file section that uses this looks like this:
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld&...
- 870
0
votes
2
answers
495
views
Is it possible to use the git merge tools on files that contain conflict markers (i.e., `<<<`, `===`, and `>>>`) *outside* a git repo?
Problem description
When merging two branches in git with conflicting files, git adds markers to the conflicting areas.
For example, a file with conflict would look like this
Some code
<<<&...
- 140
0
votes
1
answer
482
views
git mergetool throws an error "mv: cannot move <file> to <file_backup_3056>: function not implemented
I'm trying to setup Meld as my difftool as this is something I've used for a few years now and what I'm comfortable with.
As usual, I setup my meld on my PATH and put
[merge]
tool = meld
[diff]
...
- 6,348
4
votes
1
answer
298
views
How to Change Meld Dark Theme to Light Theme?
I installed Meld on Linux Mint 21 and it's in dark theme (dark background). It's a pain to do text comparison. Previously on Linux Mint 20, it's in light theme (light background). How do I change that?...
1
vote
3
answers
574
views
Access a file on remote/cluster directly
I am trying to compare two files one local and other one on remote. I used
meld a.txt user@host:/home/user/john/b.txt
This was not possible because file could not be detected. However, I could copy ...
- 5,709
1
vote
0
answers
316
views
Allowing git mergetool to create multiple tabs in meld?
This question shows how to set meld as the git mergetool, and notes
If you have more than 1 file with merge conflicts then git will open a
new Meld window for each, one after another until they are ...
- 302k
3
votes
0
answers
347
views
MacPort Meld not working on MacOS Big Sur
On my system running Big Sur, I successfully installed MacPorts and meld. But when I run meld, I get the following error
% meld
2022-04-07 17:36:21,148 CRITICAL Gtk: ...
- 171
2
votes
2
answers
3k
views
Meld not launching in Ubuntu
I just installed meld in Ubuntu 20.04. Upon trying to launch meld, I got the following error message:
Traceback (most recent call last):
File "/usr/bin/meld", line 79, in <module>
...
- 5,709
3
votes
1
answer
923
views
How to resolve merge conflict when one branch has modified a file and the other has moved it (but git thinks it has been deleted and a new file made)
I am trying to pull master-dev into my branch. My branch has moved a file (git sees this as the file being deleted and a new file made), but the same file has been modified in master-dev.
I have moved ...
- 1,944