Unable to resolve GitHub conflict in PR

Question

I have a PR in the GitHub repository (another PR of it) that cannot be merged due to conflicts.

What can I do to fix these conflicts myself?

I tried the following:

• Create a new branch from PR
• Checkout, pull and merge master
• Manually resolve conflicts. A lot of work.
• Check it locally, it works. :)
• Form all the git add . files git add .
• Lock and click
• Create a new PR
• And then another message, "This thread has conflicts that need to be resolved."

What am I doing wrong? Locally, everything works and git status reports:

On branch2, your branch has been updated with "origin / branchX".

nothing to commit, working directory inactive

PS: If I redo the "merge master", all conflicts will return. I do not understand.

Answer 1

Normal workflow:

• make sure you have the latest master from upstream , upstream , which is the name of the remote link to the source repo in the triangular workflow )

 git fetch upstream 

Then you create your own branch (in your own fork, where you extract the PR branch from another fork)

 git checkout -b branch2 otherfork/PRbranch 

And you will reinstall this branch on top of upstream/master

This is the key: no merging: only for forwarding, you resolve conflicts, and the resulting branch2 history will be an additional commit on top of upstream/master , which will make PR a simple forward merge when applied (merged) to master in the original repo ( upstream one).