merge_conflict: Merge conflict#

A pull request has a merge conflict with its base branch.

Holds when GitHub says that the pull request cannot be merged into its base branch because they changed the same lines (mergeable_state is dirty). A merged pull request has no conflict, see branch_up_to_date: Branch up to date.

It is checked on pull requests only. While the data of a pull request is not complete, the condition cannot be assessed yet.

Inputs#

The condition has no inputs.

Data#

The update of the repository reads in the background:

pull_request

Whether the pull request can be merged, is behind its base, and merges itself. Permissions of the GitHub App: pull_requests: read, contents: read; webhooks: pull_request, push.

API reference#

class pycal_dashboard.conditions.condition.merge_conflict.MergeConflict#

Bases: Condition

A pull request has a merge conflict.

Holds when GitHub says that the pull request cannot be merged into its base branch because they changed the same lines (mergeable_state is dirty). A merged pull request has no conflict.

classmethod assess(issue, values)#

Whether the pull request has a conflict.

Parameters:
  • issue – The pull request.

  • values – Nothing: the condition has no inputs.

Returns:

True if it has a conflict.