git推送失败解决方案 rejected

$ git push之后提交不成功 出现如下错误
To https://gitee.com/smilemuffie/pix.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://gitee.com/smilemuffie/pix.git'
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.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

解决步骤

1. git status -s 查看状态
   image.png
2. git add -u 将冲突文件 resolved 掉
3. git commit -m 'xxxxxxxxx'
4. git push