业精于勤,荒于嬉;行成于思,毁于随。
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
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