Search code examples
gitbitbucketmerge-conflict-resolution

Git resolve conflicts develop and release branch when develop can only be modified through pull requests


I have a problem when trying to merge (--no-ff) release/11 branch to dev branch (first a merge (--no-ff) to master branch was already done):

enter image description here

On release/11 and dev branches the same file was changed so we have conflict on PR:

enter image description here

But after locally resolving conflicts on dev I cannot push the changes directly to dev as:

enter image description here

Could anyone help how to deal with this problem?


Solution

  • while waiting for any suggestions I've added myself as only user available to push directly on dev branch and at present I can resolve conflicts in my IDE and then push them to dev.

    Maybe someone can think of different approach.