I am forking a public repository, because I want to fix some bigger issue. This has taken me some months already, now I want to update my copy, as to include the recent public changes. However, I run into unexpected problems. Following are the details:
Public repository: Mudlet/Mudletbranch:development
My fork: Kebap/Mudletbranch:development
My workplace: Kebap/Mudlet branch:documentation-in-wiki
I have now created a pull request to pull changes from Mudlet’s development branch into my fork’s development branch. After this, I want to pull changes from my development branch into my working branch. However, the first step fails.
My current pull request: https://github.com/Kebap/Mudlet/pull/6
I see a note, I need to resolve conflicts. It’s okay, I have done this before.
Recent completed pull requests:
However, inside my current pull request (at the bottom in the “This branch has conflicts that must be resolved” box) the “Resolve conflict” button is greyed-out and when I hover my mouse there, I read a note saying “development branch is a protected branch”
Why is that? I did not set my development copy to protected.
I can click the link “Use the web editor to resolve conflicts” there and resolve the conflicts. However, when I click “merge changes” then, it fails and says “This page is out of date. Start over” - even if I confirm within a matter of seconds.
I assume is because of protection, and this link shouldn’t even be available then, right?
Now please tell me. Am I doing it right? Why is this not working anymore? Thanks in advance!