jdev - 2019-10-29

  1. guus.der.kinderen

    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

  2. goffi

    kompare

  3. goffi

    or kdiff3

  4. goffi

    KDE makes great tools in general

  5. flow

    guus.der.kinderen, meld

  6. jonas’

    guus.der.kinderen, diff or merge?

  7. guus.der.kinderen

    diff suffices

  8. guus.der.kinderen

    merge would be a bonus

  9. jonas’

    I like diff | colordiff ;)

  10. jonas’

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

  11. guus.der.kinderen

    I should have known 🙂

  12. jonas’

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

  13. guus.der.kinderen

    Like what?

  14. jonas’

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

  15. jonas’

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

  16. Zash

    +1 for meld

  17. Ge0rG

    this is scary: `trustExitCode = false`

  18. Ge0rG

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

  19. guus.der.kinderen

    trust no one!