Merge Conflicts

So I forked another repository and cloned said fork onto my computer using github desktop. I pushed some changes and made a pull request to add my changes to the reposity. It said that there were merge conflicts as new PRs were merged after I made my own. When I try to merge the repositorys code with my fork the same merge conflict occurs. How can I push my changes.

1 Like

Have you tried merging the repository’s code into your fork, solving the merge conflicts and then submitting the PR?

You can solve the merge conflict via command line or most IDE’s have a merge tool. Until you solve the conflict however it will show up for both ways.