git merge code from other branches to trunk

1. View the current branch

git branch

2. Switch branches

git checkout master

3. Check again

git branch

4. Merge NO10 branch code to master

git merge N010

If there is a conflict, press: q to exit and complete, the conflict can be resolved in the visualization window of vscode~

5. Regular commit operations

git add .
git commit -m "xxx"
git push