84669 person learning
152542 person learning
20005 person learning
5487 person learning
7821 person learning
359900 person learning
3350 person learning
180660 person learning
48569 person learning
18603 person learning
40936 person learning
1549 person learning
1183 person learning
32909 person learning
As mentioned, you can first perform git pull to pull down the remote code, then merge it locally and re-commit it
First git pull update the remote code
git pull
Execute git status Follow the prompts to resolve conflicting files
git status
Then git add -A && git commit submit the version that resolves the conflictNow the version will be clean
git add -A && git commit
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
As mentioned, you can first perform git pull to pull down the remote code, then merge it locally and re-commit it
First
git pullupdate the remote codeExecute
git statusFollow the prompts to resolve conflicting filesThen
git add -A && git commitsubmit the version that resolves the conflictNow the version will be clean