[git merge code operation steps] A=>B
If xj-dev is combined with xj-pre, please use a formula to see
先切到xj-pre => 拉xj-pre最新代码 => 然后git merge xj-dev ，有冲突解决冲突 => 提交 view current branch
git branch
git merge xj-dev
view current status
git status
If there is an explosion, first solve the explosion, and then git status again
View remote branches
git branch -a
Push code to remote branch
git push origin xj-pre
Finally: start the project to refresh the interface, check to see if the page code is merged!