関連ワード:  github merge two commits    github merge two commits into one    github merge multiple commits into one    github squash two commits    github squash multiple commits    github squash multiple commits into one    github squash last two commits    github desktop combine two commits    github merge conflict example    git what causes merge conflicts