git pullで謎エラー


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

If you often merge with the same branch, you may want to
configure the following variables in your configuration

    branch.master.remote = 
    branch.master.merge = 
    remote..url = 
    remote..fetch = 

See git-config(1) for details.

というエラーが出た。 調べてもイマイチはっきりとした解決策が出てこない。 gitのコラボレータは一人だけ(つまりpushできるのは自分を入れて二人だけ)なので もう一人のリポジトリと矛盾が起こっているのだろう。

	$ git config branch.master.merge refs/heads/master
	$ git config branch.master.remote origin