ci: change merge strategy to rebase instead of squash

Change the merge method used by merge tooling to use rebase instead of using squash. (cherry picked from commit ee0d782)
angular · Jan 12, 2021 · 3512954 · 3512954
1 parent 053ec1d
commit 3512954
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.ng-dev/merge.ts b/.ng-dev/merge.ts
@@ -10,9 +10,9 @@ import { release } from './release';
 export const merge: DevInfraMergeConfig['merge'] = async api => {
   return {
     githubApiMerge: {
-      default: 'squash',
+      default: 'rebase',
       labels: [
-        {pattern: 'preserve commits', method: 'rebase'},
+        {pattern: 'squash commits', method: 'squash'},
       ],
     },
     claSignedLabel: 'cla: yes',