Skip to content

Commit d561e50

Browse files
committed
fixup! feat(ng-dev): add conditional autosquash merge strategy
1 parent fcf8702 commit d561e50

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

.github/local-actions/branch-manager/main.js

Lines changed: 2 additions & 3 deletions
Large diffs are not rendered by default.

ng-dev/pr/config/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ export function assertValidPullRequestConfig<T extends NgDevConfig>(
7979
);
8080
}
8181

82-
const {githubApiMerge} = config.pullRequest;
83-
if (githubApiMerge === undefined) {
82+
if (config.pullRequest.githubApiMerge === undefined) {
8483
errors.push('No explicit choice of merge strategy. Please set `githubApiMerge`.');
8584
}
8685

0 commit comments

Comments
 (0)