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
业精于勤，荒于嬉;行成于思，毁于随。
Try to resolve the conflict first
Then confirm whether hooks and other programs are configured
Look at the article I wrote, git FAQ
First git pull --rebaseIf there is a conflict, please resolve the conflict and then git push again
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
Try to resolve the conflict first
Then confirm whether hooks and other programs are configured
Look at the article I wrote, git FAQ
First git pull --rebase
If there is a conflict, please resolve the conflict and then git push again