Resolve Conflict button is disabled #22431
-
I recently created a pull request to a branch of a repository (which I have no write access to) and there are some conflicts. But the resolve conflict button is disabled due to the complex. Now how can I resolve this? I guess I have to resolve this locally and push to the same PR. But I am not sure what to do. More descriptive answer will truly help me since I am not a pro for GitHub. Thank you! |
Beta Was this translation helpful? Give feedback.
Replies: 3 comments
-
There are two common ways to resolve this, and yes, both are local. Either way you need to have the repository you want to merge into configured as a remote in your local repository, I’ll assume that remote is called
When done, push to the same branch you started the pull request from. With the rebase option you’ll have to force-push, so double check the result is correct. The pull request should be updated automatically when you push. |
Beta Was this translation helpful? Give feedback.
-
Thanks a lot. This helped!!! |
Beta Was this translation helpful? Give feedback.
-
This was quite helpful. I was stuck with a deactivated “Resolve Conflicts” tab. |
Beta Was this translation helpful? Give feedback.
There are two common ways to resolve this, and yes, both are local. Either way you need to have the repository you want to merge into configured as a remote in your local repository, I’ll assume that remote is called
upstream
.