3 ms·Sure, a merge commit. git checkout master git merge --no-ff feature-branchby tedmiston 11y agoSure, a merge commit. git checkout master git merge --no-ff feature-branch