Snippets Git / Merge Tools / Meld

Meld

By Marcelo Fernandes Jul 11, 2017

What is Meld?

Meld is a visual diff and merge tool targeted at developers. Meld helps you compare files, directories, and version controlled projects.

How To:


# Install the package.
sudo apt-get install meld

# Go to your repository and start using it.
cd ~/repository
# Update your copy
git pull origin master
# Solve possible conflicts
git mergetool -t meld
# Commit the merged conflicts
git commit -m "Merged conflicts"
# Push the commit
git push origin branch


Notes


Quick commands:

git mergetools -t meld
git difftools -t meld