gkellogg
commented
3 years ago Actually, I was able to resolve it with the UI.
Also, to keep your fork properly synchronized with this repo, best not make commits in the "main" branch, but create a new branch and commit changes from there. For just changing this file in the future, it may be easier to use the GitHub UI and create a pull request directly in this repo. GitHub has a page describing this here: https://docs.github.com/en/github/managing-files-in-a-repository/editing-files-in-your-repository.
@josd, the best way to resolve the conflict is to either rebase the commit on the main branch, or close this one, and create a new commit on the top of the main branch.
this would have happened because you submitted two pull requests on the same commit, so the changes conflict with each other,