20180226

2018年02月26日

肖威工作总结

• 上午：完成学校年检材料整理
• 下午：梳理年审查理 + 完成信息填报

• 晚上：查看 Ruby on Rails 案例开发 https://bjdyzlly.fliggy.com/shop/view_shop.htm?spm=a230r.7195193.1997079397.37.1omtWg

  xiaowei@xiaoweideMacBook-Pro ⮀ ~/caihuahengyibook ⮀ ⭠ xw-022602 ⮀ git push origin xw-0226 To https://github.com/shenzhoudance/caihuahengyibook.git ! [rejected] xw-0226 -> xw-0226 (non-fast-forward) error: failed to push some refs to 'https://github.com/shenzhoudance/caihuahengyibook.git' hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. ✘ xiaowei@xiaoweideMacBook-Pro ⮀ ~/caihuahengyibook ⮀ ⭠ xw-022602 ⮀ git push -u origin master -f Branch master set up to track remote branch master from origin. Everything up-to-date