Resolving a merge conflict in a pull request (PR) involves identifying the issues that caused the conflict, addressing the conflict locally, and then pushing the change remotely. Possible issues include error conditions encountered during the PR build and conflicting source files.
To check for error conditions from a failed build:
To check for conflicting source files:
In the PR with the merge conflict, under Resources, select Differences. Each affected file is indicated by the label Conflict.
After you identify the issue, address the conflict in the local repository and push the change to the branch used by the PR. If the commit resolved the issues that caused the conflict, and merge checks succeed, then the Merge button becomes available. You can now merge the PR.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4