git 添加新分支后可能报错及解决方案

报错信息：

You asked me to pull without telling me which branch you
want to merge with, and 'branch.v1.0.0.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull ').
See git-pull(1) for details.

If you often merge with the same branch, you may want to
use something like the following in your configuration file:

[branch "v1.0.0"]

remote = <nickname>

merge = <remote-ref>

 

[remote "<nickname>"]

url = <url>

fetch = <refspec>

See git-config(1) for details.

解决方案

修改.git/config文件

[core]

repositoryformatversion = 0

filemode = true

bare = false

logallrefupdates = true

[remote "origin"]

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

url = yourgitrepo

[branch "master"]

remote = origin

merge = refs/heads/master

[user]

email = yourname@yourcompany.com

name = yourname

[branch "v1.0.0"]

remote = origin

merge = refs/heads/v1.0.0