One #programming #development tool I use regularly (not *often*, though) and don’t see many people talking about is Meld (https://meldmerge.org/). How do others 2-way/3-way diff files and directories? You stay in your favorite editor/IDE (#vscode, #pycharm, #vim)? Am I missing a fancy successor to Meld?
For people who care about, support, or build Free, Libre, and Open Source Software (FLOSS).