Xiaobai asked a question about GIT update.

on the Internet, I GIT one of other people"s projects and develop my own
. As a result, I modified a file locally in the project, and someone else updated
this time, which caused me to report an error in git pull this time.
use git stash to save to the staging area
git pull update to the local
git stash pop stash@ {0}
and then open the file, merge the code manually.

Let"s look at the picture. I don"t know what happened.

Git
Feb.28,2021

you should first fork other people's projects to your warehouse, and then you should git clone your own warehouse address


No way, it is troublesome for multiple people to update a file at the same time.

automatic merge is successful in many cases. In this case, you just need to submit it locally, and then pull, and then follow the prompts of Git.

if automatic merge is not successful, it will be troublesome, and you must manually merge after pull.


read the tutorial last night
A lot of people mentioned, fork to your warehouse first. Then clone down, set up the development branch, and then manipulate the file locally. Does
need to be complicated?

MySQL Query : SELECT * FROM `codeshelper`.`v9_news` WHERE status=99 AND catid='6' ORDER BY rand() LIMIT 5
MySQL Error : Disk full (/tmp/#sql-temptable-64f5-1b313f5-2bda8.MAI); waiting for someone to free some space... (errno: 28 "No space left on device")
MySQL Errno : 1021
Message : Disk full (/tmp/#sql-temptable-64f5-1b313f5-2bda8.MAI); waiting for someone to free some space... (errno: 28 "No space left on device")
Need Help?