Resolving merge conflicts on the ClassicPress GitHub

Originally published at: https://www.classicpress.net/blog/tutorial-resolving-merge-conflicts-on-the-classicpress-github/

There has been some interest / questions about resolving merge conflicts on GitHub. This happens when two pull requests (PR) change the same part of a file in different ways.

1 Like

Hello, some context for the sudden appearance of this thread. This was an old tutorial written by @scott on Classicpress.net that didn’t have a thread linked to it. Since we are now making more tutorials and have a place to collect them, I decided to add this tutorial to our growing category here on the forum. Hope it is useful.

6 Likes