Standard:
git checkout master
git merge develop
# if there are merge conflicts, resolve them and follow with:
# git commit
That will transfer all of the historical commits on develop
to master
. If you want to keep master
's commit history clean, you can squash it all into one commit:
git checkout master
git merge develop --squash
# resolve any merge conflicts
git commit