diff --git a/.github/angular-robot.yml b/.github/angular-robot.yml index 27c99a73ba..1c69dcd509 100644 --- a/.github/angular-robot.yml +++ b/.github/angular-robot.yml @@ -45,12 +45,14 @@ merge: - "packages/bazel/src/api-extractor/**" - "packages/bazel/src/builders/**" - "packages/bazel/src/ng_package/**" + - "packages/bazel/src/protractor/**" - "packages/bazel/src/schematics/**" - "packages/compiler-cli/ngcc/**" - "packages/docs/**" - "packages/elements/schematics/**" - "packages/examples/**" - "packages/language-service/**" + - "packages/localize/**" - "packages/private/**" - "packages/service-worker/**" - "**/.gitignore" @@ -60,10 +62,15 @@ merge: - "**/third_party/**" - "**/tsconfig-build.json" - "**/tsconfig.json" + - "**/rollup.config.js" - "**/BUILD.bazel" - "**/*.md" - "packages/**/integrationtest/**" - "packages/**/test/**" + - "packages/zone.js/*" + - "packages/zone.js/doc/**" + - "packages/zone.js/example/**" + - "packages/zone.js/scripts/**" # comment that will be added to a PR when there is a conflict, leave empty or set to false to disable mergeConflictComment: "Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.