diff options
Diffstat (limited to 'releasenotes/notes/merge-conflict-rename-2-1e60065f196e48af.yaml')
| -rw-r--r-- | releasenotes/notes/merge-conflict-rename-2-1e60065f196e48af.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/releasenotes/notes/merge-conflict-rename-2-1e60065f196e48af.yaml b/releasenotes/notes/merge-conflict-rename-2-1e60065f196e48af.yaml new file mode 100644 index 000000000..962c1702e --- /dev/null +++ b/releasenotes/notes/merge-conflict-rename-2-1e60065f196e48af.yaml @@ -0,0 +1,6 @@ +upgrade: + - | + The previously deprecated ``merge-failure`` and + ``merge-failure-message`` pipeline configuration options have been + removed. Use ``merge-conflict`` and ``merge-conflict-message`` + respectively instead. |