我对git真的很陌生。我们有些人正在做一个项目。我一周前第一次把git拉了下来。然后,已经做出了多项修改。然后我试图提交并推送一些修改,这是我得到的消息:我拉到Git推送失败
error: failed to push some refs to 'ssh://[email protected]/homez.353/forumdesy/sources'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.
的,和这里的消息:
...(a list of auto-merging and conflicts and)...
Automatic merge failed; fix conflicts and then commit the result.
我该如何解决呢?
最佳, Newben,
可能的重复[如何解决Git合并冲突?](http://stackoverflow.com/questions/161813/how-doi-i-fix-merge-conflicts-in-git) –