wangrex7/yunatworkflow — pull request #5 by wangrex7 (2013-07-02 06:39:12+00:00)
Title: pull the change

命令就是先用git命令切换到分支上面，然后从分支上面拉下来代码，然后手动将冲突文件进行修改