Stack Overflow
Stack Overflow

Questions tagged [meld]

Graphical application for Linux and other OSes used for viewing and merging differences between files and directories.

Meld is a graphical application used for viewing and merging differences between files and directories. Some of its features are:

  • two and three way merging;
  • ability to handle several text encodings;
  • basic integration with version control systems;
  • available for Linux and also for Mac OS X and Windows (albeit with some limitations).

This tag should be used for questions about the use of Meld on its own or with other tools (like ).

Related tags:

210 questions
400
votes
9 answers

Setting up and using Meld as your git difftool and mergetool

Although much of the information in this question and answer is available on StackOverflow, it is spread out over lots of pages and among other answers which are either wrong or misleading. It took me a while to piece together everything I wanted to…
mattst
  • 13,340
  • 4
  • 31
  • 43
190
votes
8 answers

View differences of branches with meld?

I know that I can view the difference between HEAD and current state with meld .. But how can I view the differences between branches, for example master and devel with meld? At the moment I do the following steps: Rename folder of working copy …
Marten Bauer
  • 3,099
  • 5
  • 22
  • 18
190
votes
8 answers

Which version of the git file will be finally used: LOCAL, BASE or REMOTE?

When there's a collison during git merge, I open a mergetool called Meld. It opens three files LOCAL, BASE and REMOTE. As I've read LOCAL is my local branch, BASE is common ancestor and REMOTE is the branch to be merged. Now to my question: which…
tsusanka
  • 4,801
  • 7
  • 36
  • 42
126
votes
2 answers

git - diff of current changes before committing

I have changed several files in a git repository, but have not committed them yet. I can get a list of the changes by just invoking git status. But how do I get a listing of the lines or the content that I have changed, in addition to the…
kikito
  • 51,734
  • 32
  • 149
  • 189
118
votes
8 answers

Is there a way to see git diff from origin/master using Visual Studio Code?

Using Visual Studio Code (version 1.11.2), I can see a side-by-side graphical diff of my current changes very easily by clicking the Source Control button in the left panel. But once I commit those changes to my local repository, I am unable to find…
Uthman
  • 9,251
  • 18
  • 74
  • 104
115
votes
10 answers

How to set Meld as git mergetool

I've set: git config --global merge.tool meld git config --global mergetool.meld.path c:/Progra~2/meld/bin/ On "git mergetool" it writes: Hit return to start merge resolution tool (meld): The merge tool meld is not available as…
Paul
  • 25,812
  • 38
  • 124
  • 247
104
votes
9 answers

Git mergetool with Meld on Windows

In Linux, my favorite merge tool is Meld, and I've had no problems using or configuring it to work with Git. However, in Windows it has been a different story. First, I installed Meld from a bundle I found here:…
Nelson
  • 1,719
  • 3
  • 16
  • 26
89
votes
2 answers

Git Rebase Conflict: Who is HEAD?

I have this project where the remote repo has the main development branch, and I have a fork containing the experimental branch. I'm required to rebase changes from the development branch to my experimental branch before I push to my fork. So it…
Joseph
  • 117,725
  • 30
  • 181
  • 234
52
votes
8 answers

What are the alternatives for meld (graphical diff tool) on OSX

I mostly develop on Linux and meld is indispensable for me. However, when I'm on the road I use a MacBook (leopard) and I want to use the same set of tools as on my main development box, meld being one of them. Although you shoud be able to install…
Johan
  • 3,072
  • 3
  • 27
  • 27
43
votes
5 answers

How do I use Meld as a merge tool with Sourcetree on Windows?

I have the following in my .gitconfig file: [user] name = myname email = myname@gmail.com [core] autocrlf = true excludesfile = C:\\Users\\myname\\Documents\\gitignore_global.txt [diff] tool = meld [difftool "meld"] …
mynameisJEFF
  • 4,073
  • 9
  • 50
  • 96
36
votes
1 answer

Git merging one branch into another is a two way merge?

My git repo looks like this: _ branch_a / master / \_ branch_b Now I want to merge branch_b into branch_a, not either branch into master. So, I did git checkout branch_a git merge branch_b And git went and found a couple…
EMiller
  • 2,792
  • 4
  • 34
  • 55
34
votes
3 answers

Why doesn't `git diff` invoke external diff tool?

In my repository, if I type $ git diff some-file or $ git difftool some-file I get the in-terminal diff display. I think this should not happen, because I have set up an external diff tool, as shown by the output of git config -l: $ git config…
DanielSank
  • 3,303
  • 3
  • 24
  • 42
34
votes
3 answers

What are "synchronization points"?

In Meld there is an option available to add synchronization points. Unfortunately I cannot figure out what these so called synchronization points do. I have messed around with it but it doesn't actually seem to do anything (except break live…
siebz0r
  • 18,867
  • 14
  • 64
  • 107
30
votes
3 answers

Setting up and using Meld as your git difftool and mergetool on a Mac

How can I install Meld on MacOS, and then set it up as my difftool and mergetool in git?
Sivaram Yadav
  • 3,141
  • 3
  • 13
  • 15
29
votes
4 answers

How to set up svn conflict resolution with meld?

I've specified merge-tool-cmd = meld in my Subversion config. When I go to resolve a merge conflict using option l from the presented conflict resolution options, I receive the message: meld: error: too many arguments (wanted 0-4, got 5) The…
Joffer
  • 1,921
  • 2
  • 21
  • 23
1
2 3
…
13 14