merge

• 2021.01.26 The reverted-cherry mergency code git merge
• 2020.04.22 Break big merges to smaller pieces code git merge rebase
• 2016.12.28 How git-mediate made me stop fearing merge conflicts! code git merge