Hello everyone recently I was on a break due to my exams for a week and I wasn’t able to fix any kind of issue but after coming back I took up an issue (Ticket #36958)made a PR but I am not able to see the usual “PR does not have any resolve conflicts” message instead it I see this message “Merging is blocked
It’s not clear to me what you’re trying to merge where, but if you are trying to merge your PR into Django itself, you’re not allowed to do that.
In either case, please review:
and
you are not allowed in git to directly merge your changes in a branch unless you are a colloborator, you have to first make pr and the owner will make the merge
I am trying to merge my commit from the forked repo to the Django: main the previous PR’s I made were not showing the same message.
Yes I have made a PR through my forked repo so it can be reviewed and merged by the reviewers.
maybe your fork is not synced if you are coming after a long time could be the case or maybe you created a pr from wrong branch
Yes I think so too i have updated my forked repo do you think i need to make a new PR with new branch on updated repo or it’s not necessary.
i dont think you need to create new pr. Try updating your existing branch
Yes did that thanks lets see what the maintainers say about the issue.
I am glad that I could help
1 Like
If your PR doesn’t have conflicts, then GitHub won’t complain about them.
The message you’re seeing is expected - you don’t have permission to merge from your branch into the Django main branch (rightly so). When it’s time, a merger will merge the branch for you. That message isn’t in error, it’s correct and expected. It just means that there’s nothing wrong with the branch which prevents it from being merged - all that remains is review and approval.
If your branch needs changing, you can simply push to the underlying branch, and the PR will update - there’s no need to close your current PR or make another one.
I see nothing wrong with your PR (nor the branch it relates to).
1 Like
