diff options
Diffstat (limited to 'releasenotes')
| -rw-r--r-- | releasenotes/notes/driver-merge-mode-9e8ef35006b3ae6d.yaml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/releasenotes/notes/driver-merge-mode-9e8ef35006b3ae6d.yaml b/releasenotes/notes/driver-merge-mode-9e8ef35006b3ae6d.yaml new file mode 100644 index 000000000..ee4a62a1e --- /dev/null +++ b/releasenotes/notes/driver-merge-mode-9e8ef35006b3ae6d.yaml @@ -0,0 +1,10 @@ +--- +upgrade: + - | + The default merge mode used by Zuul for preparing git repos was + previously :value:`project.merge-mode.merge-resolve` in all cases, + but is now :value:`project.merge-mode.merge` for all drivers except + Gerrit, where :value:`project.merge-mode.merge-resolve` is still + the default. This makes the merge operations performed by Zuul + more closely match the operations that will be performed by the + code review systems. |