Rebasing

First, the principle
1, A to rebase to B, A must first calculate the amount of change in the common ancestor of AB, then replayed on B, thereby creating new submission
Second, the command
git rebase master server
command will first detection feature branch server, server rebase branch to the master.