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):
On release/11 and dev branches the same file was changed so we have conflict on PR:
But after locally resolving conflicts on dev I cannot push the changes directly to dev as:
Could anyone help how to deal with this problem?
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.