Fixed merge conflits

Author: sunil-lakshman

.github/workflows/unit-test.yml

@@ -52,14 +52,19 @@ jobs:
         working-directory: ./packages/contentstack-auth
         run: npm run test
 
-      - name: Run tests for Contentstack Import Setup
-        working-directory: ./packages/contentstack-import-setup
-        run: npm run test:unit
+      # - name: Run tests for Contentstack Import Setup
+      #   working-directory: ./packages/contentstack-import-setup
+      #   run: npm run test:unit
 
 
       - name: Run tests for Contentstack Bulk Publish
         working-directory: ./packages/contentstack-bulk-publish
         run: npm run test:unit
+
+      - name: Run tests for Contentstack Branches
+        working-directory: ./packages/contentstack-branches
+        run: npm run test:unit
+
       # - name: Fetch latest references
       #   run: |
       #     git fetch --prune

.talismanrc

@@ -1,138 +1,60 @@
 fileignoreconfig:
-  - filename: pnpm-lock.yaml
-    checksum: 2118f054aad8a4d379b03bb7eb9c5861b3337c35b9b9636e8f8ee82603aac878
-  - filename: packages/contentstack-import/test/integration/auth-token-modules/environments.test.js
-    checksum: bc6f06b75d082aaf99e2f2f4b932b143765e2f14086967fb8973fe1b2ca6c03e
-  - filename: packages/contentstack-import/test/integration/environments.test.js
-    checksum: e71f033dad8944ffeafdf22d0514bda1d20c43e8fea0d62c96e774f3414beb31
-  - filename: package-lock.json
-    checksum: 9e0dbe7f71bfab95db965d42f79802c787cfd471ce61718a9c61b81fc7395428
-  - filename: packages/contentstack-auth/test/unit/tokens-validation.test.ts
-    checksum: 1fbf278675767ed828f5c83f32d088284410f2d687365bfa759728e3b9b7fa8b
-  - filename: packages/contentstack-import/test/integration/auth-token.test.js
-    checksum: 05a5a9917440203efc6db1c5d46ba2c7ce61db4648c379db28b36e08cfe049ef
-  - filename: packages/contentstack-import/test/integration/workflows.test.js
-    checksum: 07cfe3cbb586d30b143a0169e7001a1f91ce50a1a5ae4485b2518c2181973cf7
-  - filename: packages/contentstack-import/test/integration/extensions.test.js
-    checksum: 2e62534faf6b3c5d9fd9bc001fd45e900430e835f899a2afd70b781098d2add7
-  - filename: packages/contentstack-utilities/src/helpers.ts
-    checksum: 216d92b3ccd1dce271a5b93f80af992f1bb3ac72b2b8639d2eb671bf1db91072
-  - filename: packages/contentstack-import/test/integration/global-fields.test.js
-    checksum: 16ead9a66c7834e4d24ca27eb11c6a1c70a02304c39a6c0483802e1851438903
-  - filename: packages/contentstack-import/test/integration/content-types.test.js
-    checksum: 0f15d1b877cc99ac27cd89ad31082c00f902667e631e1941d5d97d73e74d39e2
-  - filename: packages/contentstack-import/test/integration/assets.test.js
-    checksum: ca95054274b7262f3e0325ed312dac3fc09965acf4097a79184a42913c08ecb7
-  - filename: packages/contentstack-import/test/integration/auth-token-modules/assets.test.js
-    checksum: 844ac7242268fab10c0fd22cfd4e98284d6461de95d55d22925f61e1b1f29433
-  - filename: packages/contentstack-import/test/integration/locales.test.js
-    checksum: f3b6c73302f5883a40dad4e878a37bfc9780c39743c3745402037baa0cd7eab4
-  - filename: packages/contentstack-import/test/integration/custom-roles.test.js
-    checksum: 58d77f9139c9c01a4471d9ce821fbc683eaea4650787bfc510959e7817084ed6
-  - filename: packages/contentstack-import/test/integration/auth-token-modules/content-types.test.js
-    checksum: b24e5dee9677453088b2ecbd5c70b077cf99756f8fe927c4f38670e6041da94d
-  - filename: packages/contentstack-import/test/integration/entries.test.js
-    checksum: 5e33da22b28afd09ce105a6714a90e27c1e2ad559e6b9d8b41f59de02e83894c
-  - filename: packages/contentstack-import/test/integration/management-token.test.js
-    checksum: 095187d8b5fee8466f39a13e5cbc9f3c78f3dd0eb07d2c5af3929aca8aff8f2d
-  - filename: packages/contentstack-import/test/integration/auth-token-modules/custom-roles.test.js
-    checksum: 429bd7cfe81f22266da6230eae538c36a846b0267de17d0e55f611a9311eef78
-  - filename: packages/contentstack-import/test/integration/auth-token-modules/locales.test.js
-    checksum: e3ae0c7c1e7cf15d74918711f8939e46e9257b2525bf936e41d85d6328d4a018
-  - filename: packages/contentstack-import/test/integration/webhooks.test.js
-    checksum: eb11a310516a3cdfd5c2dc77bdfe7143eb268b1ab1e0e33babbe9352c5b72c38
-  - filename: packages/contentstack-import/test/integration/auth-token-modules/webhooks.test.js
-    checksum: 06290dce8c950c394d061427ad5ecce10e5f36644372d46ee542bffa09a76185
-  - filename: packages/contentstack-import/test/integration/auth-token-modules/workflows.test.js
-    checksum: 1c77d21cff245157bc9a9863cc264d29bd81591447de3b27ae3aff67239e2937
-  - filename: packages/contentstack-import/test/integration/auth-token-modules/entries.test.js
-    checksum: 75f2c3b007488e9dd0ff43bcc624f9edc9a3daf1dbb1dfd24203a488a986937d
-  - filename: packages/contentstack-import/test/integration/auth-token-modules/extensions.test.js
-    checksum: 9c79540ab8522736f17c3ae1c9bfea07784b6ed0aa41f5617c90ba6812b91e72
-  - filename: packages/contentstack-import/test/integration/auth-token-modules/global-fields.test.js
-    checksum: db5b7aedcd89d783760eb988a2369243c34edc9c12e93a41b2b08fb0da02afdc
-  - filename: packages/contentstack-export/src/export/modules/assets.ts
-    checksum: 7d64a43878f19da561da4159271873035752587a016eb7af0bb8a5592740da9d
-  - filename: packages/contentstack-variants/src/import/variant-entries.ts
-    checksum: 01059fd6aa42deb6f070f57f4376c35a85684312fb7ca4757df5b53bfe0144d2
-  - filename: packages/contentstack/README.md
-    checksum: d6da4ce77d52464737a4f22034f62fb93e47ec9200f8f788f06dbcedaae123b3
-  - filename: packages/contentstack-auth/test/unit/commands/tokens-add.test.ts
-    checksum: 32ff22c5f9b1e38c575220f1310e4e963d7309b696ef9ba96f04b96ae6254fba
-  - filename: packages/contentstack-auth/test/integration/auth.test.ts
-    checksum: fea36038171d22b5651d3405b490a10c887f343ab367c814f198d5ec6f9a5dfc
-  - filename: packages/contentstack-auth/test/config.json
-    checksum: 5976c57dd158d77cfaa47e9830c26900e80ce63a4a42c6cce3536092bd5fcdf1
-  - filename: packages/contentstack-utilities/src/config-handler.ts
-    checksum: 313960e3ae1f36dcc4636d906fa964d96e2423301e44b9b783f8f7fcf62820d8
-  - filename: packages/contentstack-export/src/export/modules/environments.ts
-    checksum: bc5c1187d6c0473abb680238e63ab892b73f5f5c702275211c06eb27ed685ff8
-  - filename: packages/contentstack-import/src/import/modules/environments.ts
-    checksum: 31a35e99dddeba8e0479422c69c907baac7f412d6d2a4695c7002328525220b3
-  - filename: packages/contentstack-import/src/utils/backup-handler.ts
-    checksum: f650cde16bd87746c1962ba78568e9ac7fb348cc2be7128b00209124b0849764
-  - filename: packages/contentstack-auth/src/base-command.ts
-    checksum: e71d02cc0a10b1c6b6a3cfb161b1f5db72a8b819a0372271198c36a17e90e0ab
-  - filename: packages/contentstack-auth/src/commands/auth/login.ts
-    checksum: 8bee22b32625624c08458ebd9750cb3b2a4000354ba7c522bf7c5bdfa64df373
-  - filename: packages/contentstack-auth/src/commands/auth/tokens/add.ts
-    checksum: 0d9f60fe54b13d8d153b39b32bfd2b00c13a21940f2438d2cca1f7b6a024bb53
-  - filename: packages/contentstack-export/src/commands/cm/stacks/export.ts
-    checksum: ece7891cb6fd7edff4a3cd54adb03ba8f7d8d5758f52d98a5c0ff0bd1b071f74
-  - filename: packages/contentstack-import/src/commands/cm/stacks/import.ts
-    checksum: c979bcc18cb0d3e5c58f1b27a106b3d89bb6524d47c0cc2b2fd199031ea33279
-  - filename: packages/contentstack-export/src/export/modules/custom-roles.ts
-    checksum: 4fc0f5cab039c84d1a12cdae90dcdcaf15ba461b23007635dc997aada75bbb23
-  - filename: packages/contentstack-import/src/utils/extension-helper.ts
-    checksum: 147ffe7069333c30a20e63f3dcfde3c4f359748f82a8b9a071adc0361a968814
-  - filename: packages/contentstack-import/src/utils/login-handler.ts
-    checksum: 9ee0a01dbdffa71a972cc8e64c24a219731e27d3c98b4607e2114337a3ebbf94
-  - filename: packages/contentstack-export/src/export/modules/extensions.ts
-    checksum: f88ae087e872332baea99bf987f25c2bc8cf48668ec40bacfd3b713f7a8767bd
-  - filename: packages/contentstack-utilities/src/interfaces/index.ts
-    checksum: 70079d81524ae4c196ffc77f13306184a8944b2903b881947dd06120150f31b0
-  - filename: packages/contentstack-export/src/export/modules/labels.ts
-    checksum: 20719233f4f8297b8242b8b9cd6067c696f4713a1983776bdde631f10ca9c914
-  - filename: packages/contentstack-export/src/export/modules/locales.ts
-    checksum: 5a8a08b49b1989f158003b2b5a63bd599a5ec0b8460887bb333fda9e6bbdb347
-  - filename: packages/contentstack-utilities/src/logger/logger.ts
-    checksum: 6fe84411b5854b39f13bf0df51a90f11787c98073081684965ffbac71fd8ac45
-  - filename: packages/contentstack-variants/src/export/attributes.ts
-    checksum: 7fe02a2d268424393faf411f84568ccfaa84ac57ace1ea4a9255126df84030bd
-  - filename: packages/contentstack-import/src/import/modules/entries.ts
-    checksum: 0ac945d6d03d4b24cba690d173da2d16f9221a8428993decb186919aaa5d87d1
-  - filename: packages/contentstack-variants/src/export/audiences.ts
-    checksum: 8a286f452b75297e89facf327852657f442d29e21a7e1c37d41d4396ae6d43ef
-  - filename: packages/contentstack-export/src/utils/basic-login.ts
-    checksum: 914b970965d027d042e52548032b8b10f5e452f0d319f8484739cc6475315360
-  - filename: packages/contentstack-variants/src/export/events.ts
-    checksum: 064534ffb3e7a11c11374f885a662642f7bffc2612b6ff50b3d88dd0bccb33ec
-  - filename: packages/contentstack-export/src/export/modules/taxonomies.ts
-    checksum: 060904d812eebfffce373b3bc478f8300e4320f76fd4245b799c96ff95cf81e4
-  - filename: packages/contentstack-export/src/utils/export-config-handler.ts
-    checksum: f551bf8175552a3645ce8d5bf9d44c72e02c00081d8c75e2503a5b11f8f214c5
-  - filename: packages/contentstack-export/src/export/modules/webhooks.ts
-    checksum: 5635f9c54abb3918b16d597e0fecb159241e7dee0f001b593bd302bf71232eec
-  - filename: packages/contentstack-variants/src/export/experiences.ts
-    checksum: 93e13de0255371ebcfadd68dc209bdc1388853e20ee3186c68d8aeeac0f5d97e
-  - filename: packages/contentstack-export/src/export/modules/workflows.ts
-    checksum: 0f078e7f8d7669b028d845edf45671a3c2627d7ca553b22cc174af2d21335c16
-  - filename: packages/contentstack-variants/src/export/projects.ts
-    checksum: 9508616a46ab57a7a438ef759a4dd3625eb6ebed4423af0a17dbbf0e5ca81dd3
-  - filename: packages/contentstack-auth/src/utils/tokens-validation.ts
-    checksum: 0f1f0fe397cf0e854da1a01db7b14c5b00210950e2a5e23ecf4a3a95aa3f2f37
-  - filename: packages/contentstack-variants/src/import/experiences.ts
-    checksum: ae230b89a601b23336879f8f80b537ceaa8328f42f81e39e696c095ae11bd07e
-  - filename: packages/contentstack-variants/src/import/attribute.ts
-    checksum: ace0e446836a92e66d538d471e7fa4ef76e04c42371f49211a4c3d520458d121
-  - filename: packages/contentstack-variants/src/utils/personalization-api-adapter.ts
-    checksum: 1d221b1e2cb3f4e8946dedc1d45a031491519aa5db63877f43f0651ffdb34ddd
-  - filename: packages/contentstack-variants/src/import/events.ts
-    checksum: e3c1754c6d3e5f3a4cb7f5e1c920cb524858848045e06d189ad6a92451e82d02
-  - filename: packages/contentstack-variants/src/import/audiences.ts
-    checksum: 9b1d68db8e25c2cf1e68e7b458adadf477875e7901327586c8e6289479549ee8
-  - filename: packages/contentstack-bulk-publish/src/producer/publish-unpublished-env.js
-    checksum: 50817911da344881b0506532fa619ed2e1ff10d026cd3a735021e710c0fdb322
-  - filename: packages/contentstack-bulk-publish/src/util/bulk-publish-utils.js
-    checksum: 4256961b963af6c7f5f0ec9b8bf9b7f22351aa826677cfff0ce81aed12c908a3
-version: ''
+- filename: package-lock.json
+  checksum: 760414d246f2265408519877647aab1fb640a9adefc4bcfbafb67934a13cd480
+- filename: pnpm-lock.yaml
+  checksum: 002a7774ddf508950ca2b1cfb277f9439d0d3a57a84cb61804e580905ba4fa5e
+- filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
+  checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
+- filename: packages/contentstack-import-setup/test/config.json
+  checksum: 187fd202d00e7d2c3d8b00f983ff21d8535e0fdb76cebec3f39c400258c88d05
+- filename: packages/contentstack-command/test/config.json
+  checksum: 7c15663b3a6562b99d3082ead5035932b0276e4fd53774b3f838372a19b291ef
+- filename: packages/contentstack-import-setup/test/unit/modules/content-types.test.ts
+  checksum: ce8772281171927e7dee7d6a761a029c902393b808e2696624fdcf0f5b80ea5c
+- filename: packages/contentstack-import-setup/test/unit/modules/entries.test.ts
+  checksum: 17652bfc125879bb37facf8ea9f54dc4f97627ca625ec148c9d551a20196d85b
+- filename: packages/contentstack-import-setup/test/unit/modules/extensions.test.ts
+  checksum: eaafdf39fc8a947aa490232bfc7da950c882bd69b5b27a0362ef2bee21f6a177
+- filename: packages/contentstack-import-setup/test/unit/modules/global-fields.test.ts
+  checksum: fd49cfab6d374254c0c6eb4c7e7ee8ff4fe6c2b46e7b0d7f7437cbe665d1ce8b
+- filename: packages/contentstack-import-setup/test/unit/modules/marketplace-apps.test.ts
+  checksum: c35dfe96d685fb12427de4b77c9240b34b9bee5e158ad7489acaa0d061ad562e
+- filename: packages/contentstack-import-setup/test/unit/modules/taxonomies.test.ts
+  checksum: 3868ff9e8833a670350590f070c6f635807f2a1f534accba677af4709fab0e4a
+- filename: packages/contentstack-import-setup/test/unit/import-config-handler.test.ts
+  checksum: f2f2c994543c388f2eecaf8128f789eab2895f1f78d659e58ef9491972c6f9a8
+- filename: packages/contentstack-import-setup/test/unit/common-helper.test.ts
+  checksum: a0c98c6f0ee88a398e3f1bd80cac0a6cc0ede7eee01957cf7d6e1f199f3da643
+- filename: packages/contentstack-import-setup/test/unit/modules/base-setup.test.ts
+  checksum: 862c52e2bbd1975b963f45ce3e89c243d047858cdbe7339918395ce2fc52bf89
+- filename: packages/contentstack-import-setup/test/unit/import-setup.test.ts
+  checksum: 1eee4f461fa5b115894d1806a14af6f45336cbe6c0392f16078bd2877fadff67
+- filename: packages/contentstack-import-setup/test/unit/login-handler.test.ts
+  checksum: e549f9ca3a9aae0d93b7284f7e771d55c0610725ddcb4333612df2f215e92769
+- filename: packages/contentstack/README.md
+  checksum: 5425309ed404d1699e9dbac73c4cfaa9f33edef5e814196ae64b0f7279010569
+- filename: packages/contentstack-import-setup/test/unit/modules/assets.test.ts
+  checksum: 449a5e3383631a6f78d1291aa3c28c91681879289398f0a933158fba5c5d5acf
+- filename: packages/contentstack-auth/env.example
+  checksum: 72c9ed18a449c42b03ec54795898f6bad4e15d23a3d701c05b96fb17c3bbd93b
+- filename: packages/contentstack-auth/test/integration/auth.test.ts
+  checksum: 9933a64d17d6d6dd7dd87ff210ce5e8a215bf36fac0cfd333894612ed10fb81b
+- filename: packages/contentstack-auth/src/utils/mfa-handler.ts
+  checksum: ca9c34a3fe6c3b957debff987aefbceb641bf4954f15541d07d901f91e5ff014
+- filename: packages/contentstack-auth/messages/index.json
+  checksum: 95856ad6273f17a9e853cda9c2cf0bdd782e47aeab93385e73ab870b5e814f89
+- filename: packages/contentstack-auth/test/utils/auth-handler.test.ts
+  checksum: f88dded3a326f191844e39258e7fe390a72fefeb387d09c7f97e4e8aed520c97
+- filename: packages/contentstack-auth/src/commands/auth/login.ts
+  checksum: 89204be8dfc1f670a568af992b54f34845e49bd4a8046c0cf041dd3759150718
+- filename: packages/contentstack-auth/test/unit/commands/tokens-add.test.ts
+  checksum: 1e7247908e1887998210381c03caca93a3983e1c8967483464cf1c3bd3209cd1
+- filename: packages/contentstack-auth/test/unit/commands/logout.test.ts
+  checksum: cd22dd04bd6a77cafa7dd0960cd4691201a3e228216d5a10041b8e39d7ebba1f
+- filename: packages/contentstack-auth/src/utils/auth-handler.ts
+  checksum: 1261d02e8215da2db28557b77d6a8c8c604e11df88520e1cc5c8561e26bdd150
+- filename: packages/contentstack-auth/test/unit/commands/login.test.ts
+  checksum: f93aa9b0c964608b60c88d4c72ff33840b58ec900297c4bae1f4ea365aa51048
+- filename: packages/contentstack-auth/test/utils/mfa-handler.test.ts
+  checksum: b067f93cf0185d794e8419cc41e8fac96ed790dea8fc48dc083ee242ccacbd4d
+version: "1.0"