Tell me about the process of merging your own branch into the dev branch; for example, your own branch is called: feature/v1.1-historydata
1. First git add in your own branch. Save the modified code in the temporary storage area, and then git commit -m ''commit message', the function of this code is to submit the modified code in the temporary storage area to the warehouse
2. Git pull your own code, the purpose is to pull down the branch code of the remote warehouse and merge it into the local branch, and then you can git push to push the modified local warehouse code to the remote warehouse
3. The purpose of git checkout dev is to switch to the dev branch, and then git pull to obtain and merge the dev code of the remote warehouse into the local. At this time, the local dev is the latest code, and now you can perform git merge feature/v1.1- historydata, the function of this step is to merge your own branch code into the dev branch, but after this merge, you will merge your own branch into the local dev branch. If the merge conflict is resolved, you need to perform git commit -m "Submit to the warehouse of the dev branch", and then perform git push, so that the merged dev branch is pushed to the remote warehouse
Note: When dealing with merge conflicts, pay attention to the code you want and the code you don't want, to avoid a series of problems caused by merging code, just be careful