3 ms·git checkout master git merge --squash some-feature-branchby bryanh 10y agogit checkout master git merge --squash some-feature-branch