0

When rebasing

git rebase upstream/develop

git cut conflict files ... not all but always at the end of rebasing

enter image description here

Please help me to solve this

for example here is enouther cutted code:

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

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

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

    $scope.faqs = faqs;

<<<<<<<
HappyCoder888
  • 736
  • 1
  • 8
  • 16
  • 1
    Please post text as *text* and not as images. Images can't be searched. – Tomas Nov 02 '15 at 12:20
  • See also here: http://stackoverflow.com/questions/7355199/git-merge-conflicts-over-newline-at-end-of-file although there is no accepted answer there – Igal S. Nov 02 '15 at 13:19

0 Answers0