Git merges, regression testing, hexagonal architecture blog-to-rss-to-email

https://timwise.co.uk/2023/10/20/use-kdiff3-for-merge-conflict-resolution/ https://timwise.co.uk/2023/10/20/git-what-do-'base'-'local'-'remote'-mean/ https://timwise.co.uk/2023/09/28/what-is-hexagonal-architecture/ https://timwise.co.uk/2019/10/14/merge-vs-rebase/ https://timwise.co.uk/subscribe/ https://github.com/rustworkshop/gitopolis/tree/3a8eb6e868a4e42370e8f4d587ad0e8525e9da2e/tests