Git Bash Merge Master Into My Branch