Skip to content
  • Sean McGivern's avatar
    Don't allow resolving invalid conflicts · 0bec78a18b61
    Sean McGivern authored
    An MR can only be resolved in the UI if:
    - It has conflicts.
    - It has valid diff_refs (in other words, it supports new diff notes).
    - It has no conflicts with one side missing.
    - It has no conflicts in binary files.
    - It has no conflicts in files too large to display.
    - It has no conflicts containing invalid conflict markers.
    0bec78a18b61