1. Introduction
This article mainly introduces how git implements branch merging and submits remote operations for reference.
Second, the specific operation steps
Suppose the dev branch is merged into the master branch
2.1 Enter the branch to be merged (you should confirm switching to the master branch at this time)
git checkout master
2.2 Merge the dev branch into the master main branch
git merge dev
2.3 Check whether there are any conflicts after the merge, and if there are conflicts, manually handle the conflicts
git status
2.4 After the code conflict is resolved, submit the modification to the remote
git push 或者 git push origin master
Three, summary
This article mainly introduces how to perform branch merge operations for reference. Welcome to discuss and exchange~