A Basic Git Workflow for Smaller Projects
medium.com
medium.com
git switch master
git merge --squash feature
git commit -m <feature description>If I wanted to move changes between branches I would probably prefer a squash rather than a regular merge, as that will look cleaner in the history.