Git Bash Merge Master Into Current Branch