How to move commit to master from another branch

Question

I have master branch and a developer branch. I did some work on developer branch, and now i want to commit my final work (final project) to master branch. How to do that?

Answer 1

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