So I have a bug fix (green) and owner also made a bug fix (red) but I would like to rework both of them due to discussion we had. I have opened a PR and there is merge conflict that can’t be resolved. Should I open a new branch in my fork and close PR or should I google some rebase magic to apply commits to my bug-fix branch.
The red commit made changes to files that after the merge would produce dead code.
Part of doing a merge commit at all is ensuring the merge results in clean code. You would need to resolve this in your merge commit, even if that area of the code was not in a merge conflict. You learn this when learning to resolve merge conflicts.