How do I differentiate between "405 Method Not Allowed" due to the source branch not being updated or due to conflicts?

[zj5220924]

python 3.10
python-gitlab 4.4.0

def merge_git_branch(self, project_id, source_branch, target_branch):
    try:
        project = self.gl.projects.get(project_id)
        merge_request = project.mergerequests.create(
            {
                'source_branch': source_branch,
                'target_branch': target_branch,
                'title': 'Merge ' + source_branch + ' into ' + target_branch
            }
        )
        print(merge_request.merge_status)
        print(merge_request.iid)
        for _ in range(60):
            if merge_request.merge_status != "checking":
                break
            time.sleep(0.5)
        merge_request.save()
        merge_request.merge()
        print('Merge ' + source_branch + ' into ' + target_branch + ' done.')
    except Exception as e:
        print("Merge error:", e)

How do I differentiate between "405 Method Not Allowed" due to the source branch not being updated or due to conflicts?

[nejch]

@zj5220924 on the python-gitlab side we're just an API wrapper so unfortunately can't do much except for always checking the response messages and status code.

Here's an example of how we look at 409 status code specifically with Resource lock error messages:
https://github.com/python-gitlab/python-gitlab/blob/main/gitlab/client.py#L759

You should be able to do something similar for your use case. I'll close this issue for now but if you have any more questions feel free to reopen!