Git执行过程中出现问题及解决方法 not-fast-forward https://help.github.com/articles/dealing-with-non-fast-forward-errors/