github 'resolve conflicts' button disabled

Question

I'm an admin on this repo. In this PR I have removed multiple files and merged these changes from local to origin/develop. When merging origin/develop to origin/master I'm getting this conflict for one of the four files I've removed. Our flow is always local to origin/develop to origin/master. I had no conflicts when mergin local to origin/develop. Github won't let me resolve the conflict.

Questions:

1. Why is the 'Resolve Conflicts' button disabled? I've never seen this before.

2. Why would this one file have a merge conflict? It's one of 3 config files that I removed completely in this PR.

3. Why am I getting this conflict on origin/develop to origin/master when I had no conflicts on local to origin/develop?

Answer 1

If the Resolve conflicts button is deactivated, your pull request's merge conflict is too complex to resolve on GitHub Enterprise or the site administrator has disabled the conflict editor for pull requests between repositories. You must resolve the merge conflict using another Git client like Atom's Git integration or the command line.