From 1d214c42b0043a59c3336d45248e1b59fa93ba47 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott@gmail.com>
Date: Mon, 11 Jan 2021 15:05:19 -0800
Subject: [PATCH] ci: change merge strategy to rebase instead of squash

Change the merge method used by merge tooling to use rebase instead of using
squash.
---
 .ng-dev/merge.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ng-dev/merge.ts b/.ng-dev/merge.ts
index 1c5cdb135795..eb41a469caad 100644
--- 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',