Skip to content

Draft: [CI] Add set-merge-config anchor to resolve line-endings conflict

norvell requested to merge ci/set-merge-config into main

Fix for line-endings conflict by adding an anchor:

.set-merge-config: &set-merge-config
  - git config set merge.renormalize || true
  - git config --local merge.renormalize true || true

to all before_script sections.

Merge request reports

Loading