branch merged into trunk

1. Add-commit-push your own branch code (dev as an example)

1. git add .
2. git commit -m ‘dev'
3. git push -u origin dev

2. Switch to the main branch (master as an example)

# 分支切换到master
git checkout master
# 拉取master最新代码
git pull origin master
# 合并dev代码
git merge dev

3. The master code is pushed to the remote server

git push origin master