The cause of conflict
Write a front page of a feature locally before you realize that you forgot to use Git to host… So I went ahead and created a (dug a hole – created a readme document)
The conflict process
I had a great time
"Git remote add origin [email protected]: XXXXXXX git push origin mainCopy the code
Then the nightmare began!
Begin the long process of conflict resolution
At first I didn’t notice that there was a conflict, so I started rechecking the branches to check the remote connection, etc., and in the meantime I was running to another version by mistake… Tip: Each commit must write message!!!!. And then very quickly I saw that there was a conflict, and I thought this is not easy to pull and then change, and then…
I…
Don’t even pull for me??
At this time began to look for solutions in the major forums
So I found the blogger
Blog.csdn.net/lindexi_gd/…
Write really good!! In the end, everything went smoothly
After this difficult git conflict journey, mom no longer need to worry about my Git conflict