1、只有完成任务才能看结果
Merge branch 'bingo'
更新配置
Merge pull request #51 from airballoon/bingo

1、只有完成任务才能看结果
代码被冲掉了
代码有冲突
Merge branch 'master' of https://github.com/airballoon/stars
Merge branch 'master' into bingo
代码冲突重新合并
Merge pull request #52 from airballoon/bingo

代码被冲掉了
db 配置
dbconfig
Merge branch 'master' into ericlinj