Git basic operation [3] -- screenshot attached

Resolve branch merge conflicts

for example ： I have two branches , One is master One is fenzhi1, Now? I'm on the same file in both branches test3.txt Operate on the contents of , And submit to the local library , After operation , I need to merge these two branches


Command for merge operation ：git merge Branch name to be merged

resolvent ： Artificial decisions test3.txt What should be kept in , Yes, delete all ？ Or keep it all ？ Or keep some ？ After the decision , then test3.txt Conduct add and commit Operation can resolve the conflict

Create an alias for the remote library address locally

command ：git remote add Alias Remote library address

Push local library to remote library

command ：git push Alias Branch name

Clone files from a remote library to a local database

command ：git clone Address of the remote warehouse

explain ： Cloning actually does three actions
1. Auto initialize local warehouse
2. Clone the remote warehouse completely to the local database
3. Created the alias of the remote library for us