0

I'm working on some project and I just created a repo and made initial commit. Then I edited eslint config (added new rule), created PR to merge it in master but GitHub wants me to resolve this "conflict".

enter image description here

Why is it even a conflict? It's just a simple addition which doesn't have to be resolved manually at all. Did I miss something in repository configuration?

JamesJGoodwin
  • 350
  • 1
  • 3
  • 17
  • 2
    FYI this has nothing to do with GitHub, it's your local copy of GIT that does this – Liam Jul 01 '21 at 13:00
  • That's on GitHub.com, it's not on my local machine. – JamesJGoodwin Jul 01 '21 at 13:12
  • 3
    Without more context, I could imagine that the head of `master` *deleted* a line that `development` *changed*, and so Git needs you to choose between the two alternatives. – chepner Jul 01 '21 at 13:12
  • For the benefit of this question, could you reproduce this issue with a public repo that you could provide us the link to? – ojdo Jul 01 '21 at 15:49
  • To see the actual conflict, set `merge.conflictStyle` to `diff3`. – torek Jul 02 '21 at 13:56

0 Answers0