BigW Consortium Gitlab
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.
Name |
Last commit
|
Last update |
---|---|---|
.. | ||
_accept.html.haml | Loading commit data... | |
_archived.html.haml | Loading commit data... | |
_build_failed.html.haml | Loading commit data... | |
_check.html.haml | Loading commit data... | |
_conflicts.html.haml | Loading commit data... | |
_merge_when_build_succeeds.html.haml | Loading commit data... | |
_missing_branch.html.haml | Loading commit data... | |
_not_allowed.html.haml | Loading commit data... | |
_nothing.html.haml | Loading commit data... | |
_reload.html.haml | Loading commit data... | |
_sha_mismatch.html.haml | Loading commit data... | |
_wip.html.haml | Loading commit data... |