I always used to merge the wrong stuff. Once I changed my mental model of MERGE="BRING IN FROM XYZ" it becomes very easy to remember "git merge development" means: Merge development INTO master