feat: set the default merge resolution strategy to prefer proposed (#551

)
aws · May 14, 2024 · f106091 · f106091
1 parent 26abe8c
commit f106091
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/packages/blueprints/blueprint-builder/src/blueprint.ts b/packages/blueprints/blueprint-builder/src/blueprint.ts
@@ -113,6 +113,11 @@ export class Blueprint extends ParentBlueprint {
     });
     this.repository = repository;
     this.repository.setResynthStrategies([
+      {
+        identifier: 'resolve_merge_conflicts',
+        strategy: MergeStrategies.preferProposed,
+        globs: ['**/**'],
+      },
       {
         identifier: 'never_update_sample_code',
         strategy: MergeStrategies.neverUpdate,
@@ -192,7 +197,13 @@ export class Blueprint extends ParentBlueprint {
               '@amazon-codecatalyst/blueprint-component.dev-environments',
               '@amazon-codecatalyst/blueprint-component.environments',
             ],
-            devDeps: ['ts-node@^10', 'typescript', '@amazon-codecatalyst/blueprint-util.projen-blueprint', '@amazon-codecatalyst/blueprint-util.cli', 'fast-xml-parser'],
+            devDeps: [
+              'ts-node@^10',
+              'typescript',
+              '@amazon-codecatalyst/blueprint-util.projen-blueprint',
+              '@amazon-codecatalyst/blueprint-util.cli',
+              'fast-xml-parser',
+            ],
           },
           null,
           2,