@contentstack/cli-cm-branches 1.0.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Contentstack
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,226 @@
+# @contentstack/cli-cm-export
+
+It is Contentstack’s CLI plugin to export content from the stack. To learn how to export and import content in Contentstack, refer to the [Migration guide](https://www.contentstack.com/docs/developers/cli/migration/).
+
+[![License](https://img.shields.io/npm/l/@contentstack/cli)](https://github.com/contentstack/cli/blob/main/LICENSE)
+
+<!-- toc -->
+* [@contentstack/cli-cm-export](#contentstackcli-cm-export)
+* [Usage](#usage)
+* [Commands](#commands)
+<!-- tocstop -->
+
+For switching to EU region update the hosts at config/default.js
+
+```js
+{
+  host:'https://eu-api.contentstack.com/v3',
+  cdn: 'https://eu-cdn.contentstack.com/v3',
+ ...
+}
+```
+
+For switching to AZURE-NA region update the hosts at config/default.js
+
+```js
+{
+  host:'https://azure-na-api.contentstack.com/v3',
+  cdn: 'https://azure-na-cdn.contentstack.com/v3',
+ ...
+}
+```
+
+# Usage
+
+<!-- usage -->
+```sh-session
+$ npm install -g @contentstack/cli-cm-branches
+$ csdx COMMAND
+running command...
+$ csdx (--version)
+@contentstack/cli-cm-branches/1.0.0 linux-x64 node-v16.20.0
+$ csdx --help [COMMAND]
+USAGE
+  $ csdx COMMAND
+...
+```
+<!-- usagestop -->
+
+# Commands
+
+<!-- commands -->
+* [`csdx cm:branches`](#csdx-cmbranches)
+* [`csdx cm:branches:create`](#csdx-cmbranchescreate)
+* [`csdx cm:branches:delete [-uid <value>] [-k <value>]`](#csdx-cmbranchesdelete--uid-value--k-value)
+* [`csdx cm:branches:diff [--base-branch <value>] [--compare-branch <value>] [-k <value>][--module <value>]`](#csdx-cmbranchesdiff---base-branch-value---compare-branch-value--k-value--module-value)
+* [`csdx cm:branches:merge [-k <value>][--compare-branch <value>] [--no-revert] [--export-summary-path <value>] [--use-merge-summary <value>] [--comment <value>] [--base-branch <value>]`](#csdx-cmbranchesmerge--k-value--compare-branch-value---no-revert---export-summary-path-value---use-merge-summary-value---comment-value---base-branch-value)
+
+## `csdx cm:branches`
+
+List the branches
+
+```
+USAGE
+  $ csdx cm:branches
+
+FLAGS
+  -k, --stack-api-key=<value>  Stack API Key
+  --verbose                    Verbose
+
+DESCRIPTION
+  List the branches
+
+EXAMPLES
+  $ csdx cm:branches
+
+  $ csdx cm:branches --verbose
+
+  $ csdx cm:branches -k <stack api key>
+```
+
+_See code: [src/commands/cm/branches/index.ts](https://github.com/contentstack/cli/blob/main/packages/contentstack-export/src/commands/cm/branches/index.ts)_
+
+## `csdx cm:branches:create`
+
+Create a new branch
+
+```
+USAGE
+  $ csdx cm:branches:create
+  $ csdx cm:branches:create [--source <value>] [--uid <value>] [-k <value>]
+  $ csdx cm:branches:create [--source <value>] [--uid <value>] [--stack-api-key <value>]
+
+FLAGS
+  -k, --stack-api-key=<value>  Stack API key
+  --source=<value>             Source branch from which new branch to be created
+  --uid=<value>                Branch UID to be created
+
+DESCRIPTION
+  Create a new branch
+
+EXAMPLES
+  $ csdx cm:branches:create
+
+  $ csdx cm:branches:create --source main -uid new_branch -k bltxxxxxxxx
+
+  $ csdx cm:branches:create --source main --uid new_branch --stack-api-key bltxxxxxxxx
+```
+
+_See code: [src/commands/cm/branches/create.ts](https://github.com/contentstack/cli/blob/main/packages/contentstack-export/src/commands/cm/branches/create.ts)_
+
+## `csdx cm:branches:delete [-uid <value>] [-k <value>]`
+
+Delete a branch
+
+```
+USAGE
+  $ csdx cm:branches:delete [-uid <value>] [-k <value>]
+  $ csdx cm:branches:delete [--uid <value>] [--stack-api-key <value>]
+
+FLAGS
+  -k, --stack-api-key=<value>  Stack API key
+  -y, --yes                    Force the deletion of the branch by skipping the confirmation
+  --uid=<value>                Branch UID to be deleted
+
+DESCRIPTION
+  Delete a branch
+
+EXAMPLES
+  $ csdx cm:branches:delete
+
+  $ csdx cm:branches:delete --uid main -k bltxxxxxxxx
+
+  $ csdx cm:branches:delete --uid main --stack-api-key bltxxxxxxxx
+
+  $ csdx cm:branches:delete --uid main --stack-api-key bltxxxxxxxx --yes
+```
+
+_See code: [src/commands/cm/branches/delete.ts](https://github.com/contentstack/cli/blob/main/packages/contentstack-export/src/commands/cm/branches/delete.ts)_
+
+## `csdx cm:branches:diff [--base-branch <value>] [--compare-branch <value>] [-k <value>][--module <value>]`
+
+Differences between two branches
+
+```
+USAGE
+  $ csdx cm:branches:diff [--base-branch <value>] [--compare-branch <value>] [-k <value>][--module <value>]
+
+FLAGS
+  -k, --stack-api-key=<value>  Provide Stack API key to show difference between branches
+  --base-branch=<value>        Base branch
+  --compare-branch=<value>     Compare branch
+  --format=<option>            [default: compact-text] [Optional] Type of flags to show branches differences
+                               <options: compact-text|detailed-text>
+  --module=<option>            Module
+                               <options: content-types|global-fields|all>
+
+DESCRIPTION
+  Differences between two branches
+
+EXAMPLES
+  $ csdx cm:branches:diff
+
+  $ csdx cm:branches:diff --stack-api-key "bltxxxxxxxx"
+
+  $ csdx cm:branches:diff --compare-branch "develop"
+
+  $ csdx cm:branches:diff --compare-branch "develop" --stack-api-key "bltxxxxxxxx"
+
+  $ csdx cm:branches:diff --compare-branch "develop" --module "content-types"
+
+  $ csdx cm:branches:diff --module "content-types" --format "detailed-text"
+
+  $ csdx cm:branches:diff --compare-branch "develop" --format "detailed-text"
+
+  $ csdx cm:branches:diff --stack-api-key "bltxxxxxxxx" --base-branch "main"
+
+  $ csdx cm:branches:diff --stack-api-key "bltxxxxxxxx" --base-branch "main" --compare-branch "develop"
+
+  $ csdx cm:branches:diff --stack-api-key "bltxxxxxxxx" --base-branch "main" --module "content-types"
+
+  $ csdx cm:branches:diff --stack-api-key "bltxxxxxxxx" --base-branch "main" --compare-branch "develop" --module "content-types"
+
+  $ csdx cm:branches:diff --stack-api-key "bltxxxxxxxx" --base-branch "main" --compare-branch "develop" --module "content-types" --format "detailed-text"
+```
+
+_See code: [src/commands/cm/branches/diff.ts](https://github.com/contentstack/cli/blob/main/packages/contentstack-export/src/commands/cm/branches/diff.ts)_
+
+## `csdx cm:branches:merge [-k <value>][--compare-branch <value>] [--no-revert] [--export-summary-path <value>] [--use-merge-summary <value>] [--comment <value>] [--base-branch <value>]`
+
+Merge changes from a branch
+
+```
+USAGE
+  $ csdx cm:branches:merge [-k <value>][--compare-branch <value>] [--no-revert] [--export-summary-path <value>]
+    [--use-merge-summary <value>] [--comment <value>] [--base-branch <value>]
+
+FLAGS
+  -k, --stack-api-key=<value>    Provide Stack API key to show difference between branches
+  --base-branch=<value>          Base branch
+  --comment=<value>              Merge comment
+  --compare-branch=<value>       Compare branch name
+  --export-summary-path=<value>  Export summary file path
+  --no-revert                    If passed, will not create the new revert branch
+  --use-merge-summary=<value>    Path of merge summary file
+
+DESCRIPTION
+  Merge changes from a branch
+
+EXAMPLES
+  $ csdx cm:branches:merge --stack-api-key bltxxxxxxxx --compare-branch feature-branch
+
+  $ csdx cm:branches:merge --stack-api-key bltxxxxxxxx --comment "merge comment"
+
+  $ csdx cm:branches:merge -k bltxxxxxxxx --base-branch base-branch
+
+  $ csdx cm:branches:merge --export-summary-path file/path
+
+  $ csdx cm:branches:merge --use-merge-summary file-path
+
+  $ csdx cm:branches:merge -k bltxxxxxxxx --no-revert
+
+  $ csdx cm:branches:merge -k bltxxxxxxxx --compare-branch feature-branch --no-revert
+```
+
+_See code: [src/commands/cm/branches/merge.ts](https://github.com/contentstack/cli/blob/main/packages/contentstack-export/src/commands/cm/branches/merge.ts)_
+<!-- commandsstop -->

package/lib/branch/diff-handler.js

@@ -0,0 +1,115 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const startCase_1 = tslib_1.__importDefault(require("lodash/startCase"));
+const camelCase_1 = tslib_1.__importDefault(require("lodash/camelCase"));
+const cli_utilities_1 = require("@contentstack/cli-utilities");
+const utils_1 = require("../utils");
+const interactive_1 = require("../utils/interactive");
+const branch_diff_utility_1 = require("../utils/branch-diff-utility");
+class BranchDiffHandler {
+    constructor(params) {
+        this.options = params;
+    }
+    async run() {
+        await this.validateMandatoryFlags();
+        await this.initBranchDiffUtility();
+    }
+    /**
+     * @methods validateMandatoryFlags - validate flags and prompt to select required flags
+     * @returns {*} {Promise<void>}
+     * @memberof BranchDiff
+     */
+    async validateMandatoryFlags() {
+        let baseBranch;
+        if (!this.options.stackAPIKey) {
+            this.options.stackAPIKey = await (0, interactive_1.askStackAPIKey)();
+        }
+        if (!this.options.baseBranch) {
+            baseBranch = (0, utils_1.getbranchConfig)(this.options.stackAPIKey);
+            if (!baseBranch) {
+                this.options.baseBranch = await (0, interactive_1.askBaseBranch)();
+            }
+            else {
+                this.options.baseBranch = baseBranch;
+            }
+        }
+        if (!this.options.compareBranch) {
+            this.options.compareBranch = await (0, interactive_1.askCompareBranch)();
+        }
+        if (!this.options.module) {
+            this.options.module = await (0, interactive_1.selectModule)();
+        }
+        if (baseBranch) {
+            cli_utilities_1.cliux.print(`\nBase branch: ${baseBranch}`, { color: 'grey' });
+        }
+    }
+    /**
+     * @methods initBranchDiffUtility - call utility function to load data and display it
+     * @returns {*} {Promise<void>}
+     * @memberof BranchDiff
+     */
+    async initBranchDiffUtility() {
+        const spinner = cli_utilities_1.cliux.loaderV2('Loading branch differences...');
+        const payload = {
+            module: '',
+            apiKey: this.options.stackAPIKey,
+            baseBranch: this.options.baseBranch,
+            compareBranch: this.options.compareBranch,
+            host: this.options.host
+        };
+        if (this.options.module === 'content-types') {
+            payload.module = 'content_types';
+        }
+        else if (this.options.module === 'global-fields') {
+            payload.module = 'global_fields';
+        }
+        payload.spinner = spinner;
+        const branchDiffData = await (0, branch_diff_utility_1.fetchBranchesDiff)(payload);
+        const diffData = (0, branch_diff_utility_1.filterBranchDiffDataByModule)(branchDiffData);
+        cli_utilities_1.cliux.loaderV2('', spinner);
+        if (this.options.module === 'all') {
+            for (let module in diffData) {
+                const branchDiff = diffData[module];
+                payload.module = module;
+                this.displaySummary(branchDiff, module);
+                await this.displayBranchDiffTextAndVerbose(branchDiff, payload);
+            }
+        }
+        else {
+            const branchDiff = diffData[payload.module];
+            this.displaySummary(branchDiff, this.options.module);
+            await this.displayBranchDiffTextAndVerbose(branchDiff, payload);
+        }
+    }
+    /**
+     * @methods displaySummary - show branches summary on CLI
+     * @returns {*} {void}
+     * @memberof BranchDiff
+     */
+    displaySummary(branchDiffData, module) {
+        cli_utilities_1.cliux.print(' ');
+        cli_utilities_1.cliux.print(`${(0, startCase_1.default)((0, camelCase_1.default)(module))} Summary:`, { color: 'yellow' });
+        const diffSummary = (0, branch_diff_utility_1.parseSummary)(branchDiffData, this.options.baseBranch, this.options.compareBranch);
+        (0, branch_diff_utility_1.printSummary)(diffSummary);
+    }
+    /**
+     * @methods displayBranchDiffTextAndVerbose - to show branch differences in compactText or detailText format
+     * @returns {*} {void}
+     * @memberof BranchDiff
+     */
+    async displayBranchDiffTextAndVerbose(branchDiffData, payload) {
+        const spinner = cli_utilities_1.cliux.loaderV2('Loading branch differences...');
+        if (this.options.format === 'compact-text') {
+            const branchTextRes = (0, branch_diff_utility_1.parseCompactText)(branchDiffData);
+            cli_utilities_1.cliux.loaderV2('', spinner);
+            (0, branch_diff_utility_1.printCompactTextView)(branchTextRes);
+        }
+        else if (this.options.format === 'detailed-text') {
+            const verboseRes = await (0, branch_diff_utility_1.parseVerbose)(branchDiffData, payload);
+            cli_utilities_1.cliux.loaderV2('', spinner);
+            (0, branch_diff_utility_1.printVerboseTextView)(verboseRes);
+        }
+    }
+}
+exports.default = BranchDiffHandler;

package/lib/branch/index.js

@@ -0,0 +1,13 @@
+"use strict";
+/**
+ * Business logics can be written inside this directory
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BranchDiffHandler = exports.MergeHandler = void 0;
+var merge_handler_1 = require("./merge-handler");
+Object.defineProperty(exports, "MergeHandler", { enumerable: true, get: function () { return __importDefault(merge_handler_1).default; } });
+var diff_handler_1 = require("./diff-handler");
+Object.defineProperty(exports, "BranchDiffHandler", { enumerable: true, get: function () { return __importDefault(diff_handler_1).default; } });

package/lib/branch/merge-handler.js

@@ -0,0 +1,227 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
+const forEach_1 = tslib_1.__importDefault(require("lodash/forEach"));
+const cli_utilities_1 = require("@contentstack/cli-utilities");
+const utils_1 = require("../utils");
+const enableEntryExp = false;
+class MergeHandler {
+    constructor(options) {
+        this.stackAPIKey = options.stackAPIKey;
+        this.strategy = options.strategy;
+        this.strategySubOption = options.strategySubOption;
+        this.executeOption = options.executeOption;
+        this.branchCompareData = options.branchCompareData;
+        this.displayFormat = options.format;
+        this.exportSummaryPath = options.exportSummaryPath || path_1.default.resolve(process.cwd());
+        this.useMergeSummary = options.useMergeSummary;
+        this.userInputs = options;
+        this.mergeSettings = {
+            baseBranch: options.baseBranch,
+            compareBranch: options.compareBranch,
+            mergeComment: options.mergeComment,
+            mergeContent: {},
+            noRevert: options.noRevert,
+        };
+        this.host = options.host;
+        this.enableEntryExp = options.enableEntryExp;
+    }
+    async start() {
+        await this.collectMergeSettings();
+        // Merge final process
+        const mergePayload = (0, utils_1.prepareMergeRequestPayload)(this.mergeSettings);
+        if (this.executeOption === 'execute') {
+            await this.executeMerge(mergePayload);
+        }
+        else if (this.executeOption === 'export') {
+            await this.exportSummary(mergePayload);
+        }
+        else {
+            await this.exportSummary(mergePayload);
+            await this.executeMerge(mergePayload);
+        }
+    }
+    async collectMergeSettings() {
+        if (!this.strategy) {
+            this.strategy = await (0, utils_1.selectMergeStrategy)();
+        }
+        if (!this.strategySubOption &&
+            this.strategy !== 'custom_preferences' &&
+            this.strategy !== 'overwrite_with_compare') {
+            const strategyResponse = await (0, utils_1.selectMergeStrategySubOptions)();
+            if (strategyResponse === 'previous') {
+                this.strategy = null;
+                return await this.collectMergeSettings();
+            }
+            else if (strategyResponse === 'restart') {
+                return await this.restartMergeProcess();
+            }
+            else {
+                this.strategySubOption = strategyResponse;
+            }
+        }
+        if (this.strategy === 'custom_preferences') {
+            this.mergeSettings.itemMergeStrategies = [];
+            for (let module in this.branchCompareData) {
+                this.mergeSettings.mergeContent[module] = {
+                    added: [],
+                    modified: [],
+                    deleted: [],
+                };
+                const selectedItems = await (0, utils_1.selectCustomPreferences)(module, this.branchCompareData[module]);
+                (0, forEach_1.default)(selectedItems, (item) => {
+                    this.mergeSettings.mergeContent[module][item.status].push(item.value);
+                    this.mergeSettings.itemMergeStrategies.push(item.value);
+                });
+                this.mergeSettings.strategy = 'ignore';
+            }
+        }
+        else if (this.strategy === 'merge_prefer_base') {
+            if (this.strategySubOption === 'new') {
+                this.mergeSettings.strategy = 'merge_new_only';
+            }
+            else if (this.strategySubOption === 'modified') {
+                this.mergeSettings.strategy = 'merge_modified_only_prefer_base';
+            }
+            else if (this.strategySubOption === 'both') {
+                this.mergeSettings.strategy = 'merge_prefer_base';
+            }
+        }
+        else if (this.strategy === 'merge_prefer_compare') {
+            if (this.strategySubOption === 'new') {
+                this.mergeSettings.strategy = 'merge_new_only';
+            }
+            else if (this.strategySubOption === 'modified') {
+                this.mergeSettings.strategy = 'merge_modified_only_prefer_compare';
+            }
+            else if (this.strategySubOption === 'both') {
+                this.mergeSettings.strategy = 'merge_prefer_compare';
+            }
+        }
+        else if (this.strategy === 'overwrite_with_compare') {
+            this.mergeSettings.strategy = 'overwrite_with_compare';
+        }
+        await this.displayMergeSummary();
+        if (!this.executeOption) {
+            const executionResponse = await (0, utils_1.selectMergeExecution)();
+            if (executionResponse === 'previous') {
+                if (this.strategy !== 'custom_preferences' && this.strategy !== 'overwrite_with_compare') {
+                    this.strategySubOption = null;
+                    return await this.collectMergeSettings();
+                }
+                else {
+                    return await this.restartMergeProcess();
+                }
+            }
+            else if (executionResponse === 'restart') {
+                return await this.restartMergeProcess();
+            }
+            else {
+                this.executeOption = executionResponse;
+            }
+        }
+    }
+    displayMergeSummary() {
+        if (this.mergeSettings.strategy !== 'ignore') {
+            for (let module in this.branchCompareData) {
+                this.mergeSettings.mergeContent[module] = {};
+                this.filterBranchCompareData(module, this.branchCompareData[module]);
+            }
+        }
+        (0, utils_1.displayMergeSummary)({
+            format: this.displayFormat,
+            compareData: this.mergeSettings.mergeContent,
+        });
+    }
+    filterBranchCompareData(module, moduleBranchCompareData) {
+        const { strategy, mergeContent } = this.mergeSettings;
+        switch (strategy) {
+            case 'merge_prefer_base':
+                mergeContent[module].added = moduleBranchCompareData.added;
+                mergeContent[module].modified = moduleBranchCompareData.modified;
+                mergeContent[module].deleted = moduleBranchCompareData.deleted;
+                break;
+            case 'merge_prefer_compare':
+                mergeContent[module].added = moduleBranchCompareData.added;
+                mergeContent[module].modified = moduleBranchCompareData.modified;
+                mergeContent[module].deleted = moduleBranchCompareData.deleted;
+                break;
+            case 'merge_new_only':
+                mergeContent[module].added = moduleBranchCompareData.added;
+                break;
+            case 'merge_modified_only_prefer_base':
+                mergeContent[module].modified = moduleBranchCompareData.modified;
+                break;
+            case 'merge_modified_only_prefer_compare':
+                mergeContent[module].modified = moduleBranchCompareData.modified;
+                break;
+            case 'merge_modified_only_prefer_compare':
+                mergeContent[module].modified = moduleBranchCompareData.modified;
+                break;
+            case 'overwrite_with_compare':
+                mergeContent[module].added = moduleBranchCompareData.added;
+                mergeContent[module].modified = moduleBranchCompareData.modified;
+                mergeContent[module].deleted = moduleBranchCompareData.deleted;
+                break;
+            default:
+                cli_utilities_1.cliux.error(`error: Invalid strategy ${strategy}`);
+                process.exit(1);
+        }
+    }
+    async exportSummary(mergePayload) {
+        if (!this.exportSummaryPath) {
+            this.exportSummaryPath = await (0, utils_1.askExportMergeSummaryPath)();
+        }
+        const summary = {
+            requestPayload: mergePayload,
+        };
+        await (0, utils_1.writeFile)(path_1.default.join(this.exportSummaryPath, 'merge-summary.json'), summary);
+        cli_utilities_1.cliux.success('Exported the summary successfully');
+    }
+    async executeMerge(mergePayload) {
+        let spinner;
+        try {
+            if (!this.mergeSettings.mergeComment) {
+                this.mergeSettings.mergeComment = await (0, utils_1.askMergeComment)();
+                mergePayload.merge_comment = this.mergeSettings.mergeComment;
+            }
+            spinner = cli_utilities_1.cliux.loaderV2('Merging the changes...');
+            const mergeResponse = await (0, utils_1.executeMerge)(this.stackAPIKey, mergePayload, this.host);
+            cli_utilities_1.cliux.loaderV2('', spinner);
+            cli_utilities_1.cliux.success(`Merged the changes successfully. Merge UID: ${mergeResponse.uid}`);
+            if (this.enableEntryExp) {
+                this.executeEntryExpFlow(mergeResponse.uid, mergePayload);
+            }
+        }
+        catch (error) {
+            cli_utilities_1.cliux.loaderV2('', spinner);
+            cli_utilities_1.cliux.error('Failed to merge the changes', error.message || error);
+        }
+    }
+    executeEntryExpFlow(mergeJobUID, mergePayload) {
+        let scriptFolderPath = (0, utils_1.generateMergeScripts)(this.mergeSettings.mergeContent, mergeJobUID);
+        if (scriptFolderPath !== undefined) {
+            cli_utilities_1.cliux.success(`\nSuccess! We have generated entry migration files in the folder ${scriptFolderPath}`);
+            cli_utilities_1.cliux.print(`\nKindly follow the steps in the guide "https://www.contentstack.com/docs/developers/cli/migrate-branch-entries" to update the migration scripts, and then run the command \n\ncsdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config compare-branch:${mergePayload.compare_branch} --branch ${mergePayload.base_branch} --stack-api-key ${this.stackAPIKey}`, { color: 'blue' });
+        }
+    }
+    async restartMergeProcess() {
+        if (!this.userInputs.strategy) {
+            this.strategy = null;
+        }
+        if (!this.userInputs.strategySubOption) {
+            this.strategySubOption = null;
+        }
+        if (!this.userInputs.executeOption) {
+            this.executeOption = null;
+        }
+        if (!this.userInputs.executeOption) {
+            this.executeOption = null;
+        }
+        this.mergeSettings.strategy = null;
+        this.mergeSettings.itemMergeStrategies = [];
+        await this.start();
+    }
+}
+exports.default = MergeHandler;

package/lib/commands/cm/branches/create.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_command_1 = require("@contentstack/cli-command");
+const cli_utilities_1 = require("@contentstack/cli-utilities");
+const create_branch_1 = require("../../../utils/create-branch");
+const utils_1 = require("../../../utils");
+class BranchCreateCommand extends cli_command_1.Command {
+    async run() {
+        const { flags: branchCreateFlags } = await this.parse(BranchCreateCommand);
+        let apiKey = branchCreateFlags['stack-api-key'];
+        let branch = {
+            uid: branchCreateFlags.uid,
+            source: branchCreateFlags.source,
+        };
+        if (!apiKey) {
+            apiKey = await utils_1.interactive.askStackAPIKey();
+        }
+        if (!branchCreateFlags.source) {
+            branch.source = await utils_1.interactive.askSourceBranch();
+        }
+        if (!branchCreateFlags.uid) {
+            branch.uid = await utils_1.interactive.askBranchUid();
+        }
+        await (0, create_branch_1.createBranch)(this.cmaHost, apiKey, branch);
+    }
+}
+exports.default = BranchCreateCommand;
+BranchCreateCommand.description = cli_utilities_1.messageHandler.parse('Create a new branch'); // Note: Update the description
+BranchCreateCommand.examples = [
+    'csdx cm:branches:create',
+    'csdx cm:branches:create --source main -uid new_branch -k bltxxxxxxxx',
+    'csdx cm:branches:create --source main --uid new_branch --stack-api-key bltxxxxxxxx',
+]; // Note: Add and modify the examples
+BranchCreateCommand.usage = [
+    'cm:branches:create',
+    'cm:branches:create [--source <value>] [--uid <value>] [-k <value>]',
+    'cm:branches:create [--source <value>] [--uid <value>] [--stack-api-key <value>]',
+]; // Note: Add and modify the usage
+BranchCreateCommand.flags = {
+    uid: cli_utilities_1.flags.string({ description: 'Branch UID to be created' }),
+    source: cli_utilities_1.flags.string({ description: 'Source branch from which new branch to be created' }),
+    'stack-api-key': cli_utilities_1.flags.string({ char: 'k', description: 'Stack API key' }),
+};
+BranchCreateCommand.aliases = []; // Note: alternative usage if any