This interface is the interface for merging branches. Because the code you downloaded from the remote warehouse is different from the code in the local warehouse, git allows you to manually filter out the differences and finally commit
This is the interface of the VI editor, http://baike.baidu.com/view/908054.htm is a command line text editor, This step of git is to enter comments No need If you modify the comment, enter a colon to enter the vi command mode, then enter x and press Enter to save and exit
You cannot push because the remote repository is newer than the local one. If you want to push at this time, you must merge the new submissions in the remote warehouse with the local submissions and then push them to the remote warehouse.
Then you execute the pull command, which is equivalent to fetch and merge, that is, fetching the content from the remote warehouse to the local one, and then merging it with the local content. Then the prompt in the second picture appears, the merged file already exists. Did you close the window directly during the merge process? It should be that the last merge was unsuccessful.
This is for inputting commit information. After all, merging is also a commit. This interface is the vim editor. If you want to enter information here, you must first switch vim to editing mode and press the i key. After completing the input, enter ":x" to save and exit. Then the merge is completed.
Now that you have merged the remote repository and the local submission, OK, execute the push command again to submit. 5. You can first use a graphical interface client such as TortoiseGit, SourceTree or SmartGit. It is not too late to learn the commands after you are familiar with the basic process.
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
Three steps of git, first commit, then pull, then push,
This interface is the interface for merging branches. Because the code you downloaded from the remote warehouse is different from the code in the local warehouse, git allows you to manually filter out the differences and finally commit
This is the interface of the VI editor, http://baike.baidu.com/view/908054.htm
is a command line text editor,
This step of git is to enter comments
No need If you modify the comment, enter a colon to enter the vi command mode, then enter x and press Enter to save and exit
You cannot push because the remote repository is newer than the local one. If you want to push at this time, you must merge the new submissions in the remote warehouse with the local submissions and then push them to the remote warehouse.
Then you execute the pull command, which is equivalent to fetch and merge, that is, fetching the content from the remote warehouse to the local one, and then merging it with the local content. Then the prompt in the second picture appears, the merged file already exists. Did you close the window directly during the merge process? It should be that the last merge was unsuccessful.
This is for inputting commit information. After all, merging is also a commit. This interface is the vim editor. If you want to enter information here, you must first switch vim to editing mode and press the i key. After completing the input, enter ":x" to save and exit. Then the merge is completed.
Now that you have merged the remote repository and the local submission, OK, execute the push command again to submit.
5. You can first use a graphical interface client such as TortoiseGit, SourceTree or SmartGit. It is not too late to learn the commands after you are familiar with the basic process.
git push -u origin master -f
pull is unsuccessful, first execute
`git pull --all