Shulou(Shulou.com)06/01 Report--

Because of github I used dev and feature branches, teamwork merged into dev, and personal development was all feature..... Git pull origin dev appears in the local feature today

Errors may occur when using git to push to gitHub the source code

The main reason for the error is that the README.md file in github is not in the local code directory

You can merge code with the following command [Note: pull=fetch+merge]

Git pull-rebase origin dev

After executing the above code, you can see that there are many README.md files in the local code library, and the red area is the conflict file. well, under conflict resolution editing, pull is normal.

Welcome to subscribe "Shulou Technology Information " to get latest news, interesting things and hot topics in the IT industry, and controls the hottest and latest Internet news, technology news and IT industry trends.