jdev - 2019-10-29

Not XMPP-specific, but as you're all devs: Can someone suggest a good visual diff tool (for linux)? I've not find one to my liking so far

kompare

or kdiff3

KDE makes great tools in general

guus.der.kinderen, meld

guus.der.kinderen, diff or merge?

diff suffices

merge would be a bonus

I like diff | colordiff ;)

meld is my current favourite for merge, but it needs extra (git) config to work sanely with git

I should have known 🙂

terrible things happen silently when you use it without that extra config

Like what?

guus.der.kinderen, meld gets confused about the direction things are happening in and will auto-merge your new changes away

https://marcin-chwedczuk.github.io/use-meld-as-git-merge-diff-tool

+1 for meld

this is scary: `trustExitCode = false`

can't developers honor the oldest and easiest of APIs?

trust no one!