Git pull request says: "This thread has conflicts that need to be resolved"

Question

I searched from an open source repository and cloned it from my fork. I created a function branch, made some changes, pushed them to a forked repo and sent a pull request from there to the main repo.

Later, I made more changes to the same local function branch, pulled from the last wizard from the open source repository, reinstalled my changes on this and pushed them to the same function branch on my fork. The transfer request was automatically updated, but now the request page on GitHub (both in my repo and basically the repo) notes that “all checks passed”, but then says: “This branch has conflicts that need to be resolved” .

Is it just because other pull requests were merged after my submission? Or maybe another reason for the conflict? How to find out the reason?

The answers I saw before posting this question related to merging branches with different names or owners. I want to know:

• Did I execute the transfer request correctly? If not, what should be different? (There were no conflicts in local git after rebooting and before sending the pull request.)
• If other changes were made to the open source branch after I reviewed the migration request, would the "branch conflicts" error result?
• If the transfer request was completed correctly, and if subsequent updates from other sources do not lead to this error, how do you know what caused the error?

Answer 1

This is because the upstream (the original repo from which you branched out) has commits that are not included in your refund request repository (regardless of whether they are approved from other traction requests, and also only for own commits is a controversial point).

The solution here is to fetch from upstream repo (the original repo from which you are bifurcated), and resolve merge conflicts locally so that your pull request doesn’t run, it requires the original repo reviewer to deal with merge conflicts.