As shown in the picture, please tell me, when I use the git pull origin develop command to pull other people's changes on the remote develop branch to my own warehouse, this situation often occurs.
It seems that the merge information is input, but how should this information be written on the command line?
我想大声告诉你2017-05-02 09:40:06
Conflict between local files and warehouse files
http://www.01happy.com/git-resolve-conflicts/
仅有的幸福2017-05-02 09:40:06
I also encountered this problem. Just press i first to switch to insert mode, and then you can input. After inputting, press esc first, then enter: wq, and press Enter. But I haven’t found a way not to display this.
PHPz2017-05-02 09:40:06
This message is opened in vi mode by default. Press esc and enter: wq to save, and the submission of the merge message is completed. If you just want to pull the branch without merging, please use git fetch
