git使用问题解决不能pull

一、尽量不要使用网易邮箱

二、修改config文件如下来解决不能pull问题

[core]

symlinks = false

repositoryformatversion = 0

filemode = false

logallrefupdates = true

[user]

name = [e-mail]

email = [e-mail]

[branch "master"] 

        remote = origin 

        merge = refs/heads/master

[remote "origin"] 

  url = https://github.com/xx/Mifi_Test.git

  fetch = +refs/heads/*:refs/remotes/origin/*

 

三、解决完冲突文件要先Add to git index  再 commit到本地合并，最后push