先从oschina下载
Merge remote-tracking branch 'origin/master'
任务
Merge remote-tracking branch 'upstream/master'