4. resolve conflicts
Solution: In the code to be submitted to the local merge, post-conflict and re-commit to the remote and push
Example: submit code to the master branch from the test, I found it impossible to merge, diff confirm a conflict in the file. Specific operation is as follows:
step1: Cut the master branch: git checkout master
step2: Pull the latest master codes, git pull origin master
step3: Cut back test, git checkout test
step4: Merge branch, git merge master -m "merge master"
step5: find conflict files, execute git status, red file is the file conflict
step6: Open conflict file, find the location of a conflict, and modify the code after other students confirm, modify the position of conflict
step7: git add file conflict
step8:git commit -m "xxxxxx"
step9: git push origin test