csWiki

the wiki of cscosine


Project maintained by cscosine Hosted on GitHub Pages — Theme by mattgraham

Table Of Contents

Setup Meld as Default Git Merge Tool on Ubuntu/Debian

1️⃣ Install Meld

sudo apt update
sudo apt install meld

2️⃣ Configure Git to use Meld

git config --global merge.tool meld
git config --global mergetool.meld.path meld
git config --global mergetool.keepBackup false
git config --global mergetool.prompt false
git config --global diff.tool meld
git config --global difftool.prompt false

3️⃣ Usage

Merge conflicts

git mergetool

Opens Meld with LOCAL, BASE, REMOTE, MERGED view

Viewing diffs

git difftool

Opens Meld to compare changes between commits or branches