push出错解决办法

出现的错误如下:
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.

解决办法:git pull --rebase

直接git pull 默认的是merge的合并方式,想要采用rebase合并的方法,加上--rebase参数即可,如下:

git pull --rebase(采用rebase方法合并,听下来去修改冲突)vvv