Merge a branch while squashing commits

Back to index
Date: 2021-07-11
Category: git


git checkout master # switch to branch to merge onto
git merge --squash dev/yourBranch # merge
git commit # commit, and edit commit message