Skip to content

Commit ee0d782

Browse files
josephperrottalan-agius4
authored andcommitted
ci: change merge strategy to rebase instead of squash
Change the merge method used by merge tooling to use rebase instead of using squash.
1 parent a266f55 commit ee0d782

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.ng-dev/merge.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import { release } from './release';
1010
export const merge: DevInfraMergeConfig['merge'] = async api => {
1111
return {
1212
githubApiMerge: {
13-
default: 'squash',
13+
default: 'rebase',
1414
labels: [
15-
{pattern: 'preserve commits', method: 'rebase'},
15+
{pattern: 'squash commits', method: 'squash'},
1616
],
1717
},
1818
claSignedLabel: 'cla: yes',

0 commit comments

Comments
 (0)