The main branch is master, and the branch PDD
Now that the code is finished, it needs to be submitted, but someone has already submitted his code first.
Now I want the master branch to get the latest remote code. How to do it?
I Remote Added the latest code address, but the view position of master in All Branch History did not jump to the time period when others modified the code. It was still at the time when I operated on June 10th.
Remote -> There are two options in fetch from. What is this? Can you delete it at will?
is gui, not command line
女神的闺蜜爱上我2017-07-03 11:43:14
I don’t know what GUI you are using, so I can’t give you a clear answer. For the same-origin warehouse, if your modifications do not conflict with the modifications of others remotely, you can first perform a pull here (if you are developing on the same branch), merge the remote changes into your local working directory, and then submit them. and push your changes to the remote.
If there is a conflict (you can submit yours first if there is no conflict, but the history lines will have some intersections), submit your local changes first, then execute pull, and resolve the conflicts found (resolving conflicts is not as simple as you or him, you Be clear about what you want to keep and what you don’t want to delete, don’t take away other people’s functions), after the conflict is resolved, submit and push
