Another Git catastrophe cleaned up https://blog.plover.com/prog/git-tastrophe.html (nice demo of custom merge drivers and advanced git-fu)
miniblog.
Related Posts
Cleaned up an old git repo of Ansible playbooks and it's amazing how much is just Docker now.
Docker handles process supervision, centralises logging, and containers coexist without issues. It's nice when things get simpler.