Update gitshorts.org

Added branch and merge notes