git rebase在文件末尾剪切代码

Question

重新定位时

git rebase upstream/develop

git cut冲突文件...并非总是在变基的结尾处

请帮我解决这个问题

例如，这里是一个更密切的代码：

CONFLICT (content): Merge conflict in code/client/js/resident/controllers/faq.js

＆＃13;

＆＃13;

angular.module('smartnest.resident.index')

  .controller('ResidentFaqController', ['$scope', 'faqs', function($scope, faqs) {

    $scope.faqs = faqs;

<<<<<<<

＆＃13;

＆＃13;

＆＃13;