Skip to content

Show the conflicted diff only in ee-specific-lines-check

Lin Jen-Shin requested to merge 6856-print-conflicted-diff into master

What does this MR do?

Show the conflicted diff only in ee-specific-lines-check

Why was this MR needed?

Look at https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/80330885

Those modifications were actually clean. The only important information was:

UU app/models/ci/build_trace_chunk.rb

We could just print the diff contents so it's much easier to diagnose.

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Closes #6856 (closed)

Edited by Rémy Coutable

Merge request reports