Calum Halpin questions

Calum Halpin answers

• How do I see the changes in a tree conflict ("deleted by us" or "deleted by them")?
• Ansible: Convert two lists into key, value dict
• How can I copy commits from one branch to another?
• Where store password / login-path in MariaDB (equivalent for mysql-config-editor)?