来源：https://stackoverflow.com/questions/19758915/keeping-a-branch-up-to-date-with-master 标签 git git-branch git-merge
