関連ワード:  merge commit vs rebase    merge commit vs rebase and merge github    merge commit vs rebase vs squash    merge commit or rebase    git merge commit vs rebase    update with merge commit vs rebase    merge commit squash or rebase    create a merge commit vs rebase    git merge commit or rebase    update branch with merge commit vs rebase