Skip to content

Create vale test for unresolved merge conflicts

Marcel Amirault requested to merge docs-vale-merge-conflict-test into master

What does this MR do?

As discussed in #219165 (closed), since static-analysis does not run for docs-only MRs, the lint-conflicts.sh script does not check for improperly resolved/unresolved merge conflicts if there are only docs in the MR.

Instead of running this job, or script, in docs pipelines, I created a new Vale test to accomplish the same thing, without adding new jobs, scripts or any other overhead.

From testing:

 124:1  error  Potential unresolved merge      gitlab.MergeConflicts 
               conflict found (<<<<<<< HEAD).                        
 126:1  error  Potential unresolved merge      gitlab.MergeConflicts 
               conflict found (=======).                             
 128:1  error  Potential unresolved merge      gitlab.MergeConflicts 
               conflict found (>>>>>>>                               
               branch).                                              

✖ 3 errors, 0 warnings and 0 suggestions in 1419 files.

Related to !33108 (merged)
Related to #219165 (closed)
Closes #219168 (closed)

Edited by Yorick Peterse

Merge request reports