我正在尝试将从其他开发人员推送的最新代码提取到部署到本地系统的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.
答案 0 :(得分:-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*