[Git] git branch pull and merge

Pull and merge branch process

1. Switch to the test branch
git checkout <Switch to the branch that needs to be merged>

2. Pull the server code
git pull

3. Merge your own branch to the current branch
git merge <the branch that needs to be merged>

4. Upload the local dev environment to the test environment
git push