diff options
| author | Zuul <zuul@review.opendev.org> | 2022-10-27 02:25:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-10-27 02:25:37 +0000 |
| commit | 760630415936694289b9edf6526ecb16a0014fb6 (patch) | |
| tree | f9faff4772a9764aa89a915a55730c7d700e3ef4 /releasenotes | |
| parent | 9d2e1339ff9f5080cd23e9d29fcb08315a32e5e9 (diff) | |
| parent | e2a472bc9708c8f7b222b43a75540d64bef77d82 (diff) | |
| download | zuul-760630415936694289b9edf6526ecb16a0014fb6.tar.gz | |
Merge "Change merge mode default based on driver"
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. |