git pull heroku master失败

Question

我试图将从另一个开发人员推送到部署到我的本地系统的heroku的最新代码中：

我执行以下命令：

$ git pull heroku master failed

但是我收到以下错误：

remote: Counting objects: 13, done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 8 (delta 5), reused 1 (delta 0)
Unpacking objects: 100% (8/8), done.
From https://git.heroku.com/titan-demo
 * branch            master     -> FETCH_HEAD
 * [new branch]      master     -> heroku/master
Auto-merging db/schema.rb
CONFLICT (content): Merge conflict in db/schema.rb
Automatic merge failed; fix conflicts and then commit the result.

Answer 1

CONFLICT occurs in following file at that time the git could not auto merge the CONFLICT so you will remove the conflict in manually in this file db/schema.rb. the file conflict location is denoted as below syntax so you will remove unnecessary code and after you push the code. 

// CONFLICT Example
<<<<<<<<<<<< HEAD *code from develop*
>>>>>>>>>>develop *code form your's*