#31 pull request merge throws an error but gets merged anyways
Opened 5 years ago by lenkaseg. Modified 3 months ago

I have a PR and I try to merge it with cranc merge pr --request_id [number]. The PR is not rebased. I get an error:

raise APIError(output["error"])
libpagure.exceptions.APIError: This pull-request conflicts and thus cannot be merged

but the PR gets merged anyways.

Note: Not sure, it the PR is closed as merged, but the changes are not applied or it really even merges.


This happens when trying to merge a PR without commit.

Add better error message.

Several factors might contribute to this:

Incomplete Conflict Resolution: The cranc merge pr command may attempt to merge the pull request despite the conflicts, but the underlying merge mechanism is not processing them correctly mapquest driving directions. This might result in the PR seeming to be merged but the modifications not properly implemented.
Inconsistent State: There may be a difference between the state reported by the API and the real state of the pull request. The API may indicate a conflict, while the underlying merging process is still active, resulting in inconsistent behavior.

if the PR's state is uncertain or incorrect, consider closing the retro bowl current PR and creating a new one with the correct changes and resolutions.

If the PR still appears to be merged, it might have been fnaf game merged with conflicts that were manually resolved or ignored.

The error you encountered (libpagure.exceptions.APIError: This pull-request conflicts and thus cannot be merged) indicates mapquest directions that the PR has conflicts. Check the error handling in your script or tool (cranc merge pr) to ensure it properly addresses merge conflicts.

Log in to comment on this ticket.

Metadata