What's the best three-way merge tool?

Subversion, Git, Mercurial and others support three-way merges (combining mine, theirs, and the "base" revision) and support graphical tools to resolve conflicts. What tool do you use? Windows,...

Installing meld on OS X

After I got MacPorts installed and did a 'sudo port -v selfupdate', I try to install meld. The installation just starts to Fetching all kinds of...

ubuntu /usr/bin/env: python: No such file or directory

I update the kernel, after that the Ubuntu doesn't work well, PS: I try to exec "meld" command, it will report that "/usr/bin/env: python: No such file or directory", then I exec "sudo apt-get...

How to merge all files manually in Git?

I want to merge all files manually with meld or any other diff tool, how can I do this with Git? When I run git mergetool it says no files need merging. So I suppose I can do it only if I have conflicts.

How can I perform a diff that ignores all comments?

I have a large codebase that was forked from the original project and I'm trying to track down all the differences from the original. A lot of the file edits consist of commented out debugging...

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...

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...

Diff tool for Mac without saving text to files

I use meld on Linux and I am able to compare two pieces of text without having to save them in files. Is there something similar for Mac and Windows?

how to enable meld file filters

I use meld normally in a git web project (system: Ubuntu-gnome 13.10). I want it to skip scanning certain files and folders, such as the .meteor directory (which takes a while to...

git ahead/behind info between master and branch?

I have created a branch for testing in my local repo (test-branch) which I pushed to Github. If I go to my Github account and select this test-branch it shows the info: This branch is 1 commit...

Git status ignore line endings / identical files / windows & linux environment / dropbox / meld

How do I make git status ignore line ending differences? Background info: I use randomly Windows and Linux to work on the project. The project is in Dropbox. I found a lot about how do make git...

How to have meld as git mergetool to only show conflict and not differences?

When I use meld as git mergetool for solving conflict while merging, meld shows me the differences between local/output and remote/output files (in blue or green) that git automatically solves,...

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...

Can Meld comparison output be exported to a file?

I've been using Meld to compare directories recursively. I want to know how to export the comparison result onto a new file. Meld is a visual tool but is there any way I can save the comparison?

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...

Ubuntu meld: No GSettings schemas are installed on the system

This is a vanilla Ubuntu 16.04 LTS, based on Xubuntu core to be exactly. So I need to install packages myself. All went well except meld, on starting which, I'll get: (meld:4188): GLib-GIO-ERROR...

How to change the background color of Meld?

I have Linux Mint 17.3 Rosa - Cinnamon as OS, the desktop is Gnome, and the toolkit is GTK 3.10.8 and GTK 2.24.23. I would love to change the background of Meld to a darker color. I followed these...

How to svn diff two files in different branch and from two specific revison?

I can use this get the diff between a specific revision number and latest version for a certain file svn diff -r<revision number> --diff-cmd='meld' <svn_url> But if I have two files, in two...

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?

Using meld together with visual studio

I use VS 2017 and I want to view a file changes in meld from visual studio, or call meld for file from Visual Studio comfortably. How can I do this?

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...

How to use different merge and diff tool in git?

I prefer to use meld as the diff tool. However it doesn't have an option to quickly solve all simple conflicts so in case of merging I'd like to use kdiff3 I've set merge.tool to kdiff3 and...

Is here any GUI tool that can show file with conflicts side-by-side?

I have a couple of conflicted files and I don't have access to source branches (these files are detached from the repository. There isn't any .git folder and I don't have original versions). There...

git rebase cannot 'squash' without a previous commit

I used to use git rebase -i all the time, but suddenly it stopped working. git rebase does not work in any project I have, which is weird and I suspect it's something wrong with my git...

How to totally delete the last two commits from GitHub from a specific branch

Please, before closing as duplicated question, take in account I am trying to follow some recommendations found around. I have two branches and I don't want to create a new branch at all: master...

How to set up a flatpak version of Meld as git mergetool?

Installing Meld as a regular Linux package, it is fairly straighforward to setup Meld as git merge tool, here is an extract of my .gitconfig. [merge] tool = meld [mergetool "meld"] ...

meld doesn't automatically open at the forefront

I am using MacBook Pro. I have set up git difftool to work with meld. Here is my ~/.gitconfig: [diff] tool = meld [difftool] prompt = false [difftool "meld"] ...

Setting up Unity Smart Merge with Git and Meld for Unity 2019.3+

I looked everywhere for documentation on this matter with little to no success. Unity's own documentation is very much incomplete when it comes to this dynamic. I am here to provide you with the...

What free git diff GUI can I use on MacOS Big Sur?

I am attempting to do a git diff on macOS Big Sur, and much of the apps I would use on Windows or Linux (e.g. Meld, Kdiff3, etc), don't seem to be operable anymore under BigSur perhaps because the...

Inertia.JS reload props after post request

I am currently pretty confused why Inertia.js is not reloading or rerendering my page. I have a form that could be filled, once submitting this will execute: Inertia.post("/ban", ban); This will...

Relevant tags