| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| file.rb | ||
| file_collection.rb | ||
| parser.rb |
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 |
|---|---|---|
| .. | ||
| file.rb | Loading commit data... | |
| file_collection.rb | Loading commit data... | |
| parser.rb | Loading commit data... |