今天经过老大的指点,终于一解困惑我多年的这个问题:使用git时候,本地新建分支, push到remote上去后,再次pull下来,会报以下提示:You asked me to pull without telling me which branch you
want to merge with, and 'branch.production.merge' in
your configuration file does not tell me...
查看更多
[color]
diff = auto
status = auto
branch = auto
[alias]
st = status
rb = svn rebase
ci = commit -a
co = checkout
br = branch
lol = log --pretty=oneline --abbrev-commit --graph --decorate
[pus...
查看更多