Home > Q&A > body text
PHPz2017-05-02 09:34:14
Try to resolve the conflict first
Then confirm whether hooks and other programs are configured
过去多啦不再A梦2017-05-02 09:34:14
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