# GIt-解决冲突

Updates were rejected because the remote contains work that you do not have locally.
This is usually caused by another repository pushing to the same ref.
You may want to first integrate the remote change(e.g., 'git pull ...') before pushing again.
See the 'Note about fast-forwards' in 'git push --help' for details.

Pulling is not possible because you have unmerged files.Fix them up in the work tree, and then use 'git add/rm <file>' as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

<<<<<<<=======>>>>>>>这个会标志有冲突的代码。