Git Idea 冲突解决

在push的时候吐过remote版本新，push提交的时候会提示

error: failed to push some refs to 'https://gitee.com/fa/test.git'
hint: Updates were rejected because the remote contains work that you doTo https://gitee.com/fanru/test.git

!    refs/heads/master:refs/heads/master    [rejected] (fetch first)hint: not have locally. This is usually caused by another repository pushing

Done
hint: to the same ref. You may want to first 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.

需要先pull

提示conficts

双击进行冲突解决

点击Apply在Push就可以了