qkpr 1.0.4 → 1.0.5-beta.1

package/dist/index.mjs

@@ -235,6 +235,29 @@ function createMergeBranch(targetBranch, mergeBranchName) {
 	}
 }
 /**
+* 合并原始分支到合并分支
+*/
+function mergeSourceToMergeBranch(sourceBranch) {
+	try {
+		console.log(cyan(`\n🔄  Merging source branch '${sourceBranch}' into current merge branch...`));
+		execSync(`git merge ${sourceBranch}`, { stdio: "inherit" });
+		console.log(green(`✅  Successfully merged '${sourceBranch}' into merge branch`));
+		return true;
+	} catch (error) {
+		if (error.status === 1 && error.stdout?.includes("CONFLICT")) {
+			console.log(yellow(`⚠️  Merge conflicts detected!`));
+			console.log(dim(`   Please resolve conflicts manually and then run:`));
+			console.log(dim(`   git add <resolved-files>`));
+			console.log(dim(`   git commit`));
+			return false;
+		} else {
+			console.log(red("❌  Failed to merge source branch"));
+			console.log(dim(`Error: ${error.message || "Unknown error"}`));
+			return false;
+		}
+	}
+}
+/**
 * 复制文本到剪贴板
 */
 function copyToClipboard(text) {
@@ -1333,11 +1356,25 @@ async function promptCreateMergeBranch(mergeBranchName) {
 		type: "confirm",
 		name: "createMergeBranch",
 		message: "Do you want to create a merge branch for conflict resolution?",
-		default: false
+		default: true
 	}]);
 	return createMergeBranch$1;
 }
 /**
+* 确认是否自动合并原始分支到合并分支
+*/
+async function promptAutoMergeSource(sourceBranch, targetBranch) {
+	console.log(yellow(`\n🔄  Merge branch created successfully!`));
+	console.log(dim(`   This branch is based on '${targetBranch}' and can be used to test the merge.`));
+	const { shouldAutoMerge } = await inquirer.prompt([{
+		type: "confirm",
+		name: "shouldAutoMerge",
+		message: `Auto-merge '${sourceBranch}' to detect potential conflicts now?`,
+		default: false
+	}]);
+	return shouldAutoMerge;
+}
+/**
 * 显示 PR 信息
 */
 function displayPRInfo(prMessage, prUrl) {
@@ -1363,7 +1400,7 @@ async function handlePinCommand(branchName) {
 		addPinnedBranch(branchName);
 		console.log(green(`✅  Branch '${branchName}' has been pinned`));
 	} else {
-		const { getAllBranches: getAllBranches$1 } = await import("./pr-3u9dEVEc.mjs");
+		const { getAllBranches: getAllBranches$1 } = await import("./pr-C2AR97YR.mjs");
 		const branches = getAllBranches$1();
 		if (branches.length === 0) {
 			console.log(yellow("⚠️  No branches found"));
@@ -1809,6 +1846,21 @@ async function handlePRCommand() {
 	}
 	if (await promptCreateMergeBranch(prInfo.mergeBranchName)) {
 		if (!createMergeBranch(targetBranch, prInfo.mergeBranchName)) return;
+		if (await promptAutoMergeSource(gitInfo.currentBranch, targetBranch)) {
+			console.log(yellow(`\n🔄  Merging '${gitInfo.currentBranch}' to detect conflicts...`));
+			if (!mergeSourceToMergeBranch(gitInfo.currentBranch)) {
+				console.log(yellow("\n⚠️  Merge conflicts detected! Please resolve them manually:"));
+				console.log(dim(`   1. Resolve conflicts in your editor`));
+				console.log(dim(`   2. Run: git add <resolved-files>`));
+				console.log(dim(`   3. Run: git commit`));
+				console.log(dim(`   4. Push the merge branch when ready`));
+			}
+		} else {
+			console.log(green(`\n✅  Merge branch '${prInfo.mergeBranchName}' created without merging.`));
+			console.log(dim(`   You can manually merge later when ready:`));
+			console.log(dim(`   git checkout ${prInfo.mergeBranchName}`));
+			console.log(dim(`   git merge ${gitInfo.currentBranch}`));
+		}
 	}
 	console.log(green("\n🎉  PR creation process completed!\n"));
 }
@@ -1857,4 +1909,4 @@ yargs(hideBin(process.argv)).scriptName("qkpr").usage("Usage: $0 <command> [opti
 }).version(version).alias("v", "version").help("h").alias("h", "help").epilog("For more information, visit https://github.com/KazooTTT/qkpr").argv;
 
 //#endregion
-export { generatePRMessage as a, getBranchCategory as c, getCommitsBetweenBranches as d, getGitInfo as f, generateMergeBranchName as i, getBranchLastCommitTime as l, createMergeBranch as n, generatePRUrl as o, parseRemoteUrl as p, createPullRequest as r, getAllBranches as s, copyToClipboard as t, getBranchesWithInfo as u };
+export { generatePRMessage as a, getBranchCategory as c, getCommitsBetweenBranches as d, getGitInfo as f, generateMergeBranchName as i, getBranchLastCommitTime as l, parseRemoteUrl as m, createMergeBranch as n, generatePRUrl as o, mergeSourceToMergeBranch as p, createPullRequest as r, getAllBranches as s, copyToClipboard as t, getBranchesWithInfo as u };

package/dist/pr-C2AR97YR.mjs

@@ -0,0 +1,3 @@
+import { a as generatePRMessage, c as getBranchCategory, d as getCommitsBetweenBranches, f as getGitInfo, i as generateMergeBranchName, l as getBranchLastCommitTime, m as parseRemoteUrl, n as createMergeBranch, o as generatePRUrl, p as mergeSourceToMergeBranch, r as createPullRequest, s as getAllBranches, t as copyToClipboard, u as getBranchesWithInfo } from "./index.mjs";
+
+export { copyToClipboard, createMergeBranch, createPullRequest, generateMergeBranchName, generatePRMessage, generatePRUrl, getAllBranches, getBranchCategory, getBranchLastCommitTime, getBranchesWithInfo, getCommitsBetweenBranches, getGitInfo, mergeSourceToMergeBranch, parseRemoteUrl };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "qkpr",
   "type": "module",
-  "version": "1.0.4",
+  "version": "1.0.5-beta.1",
   "description": "Create a Pull Request with interactive branch selection",
   "author": "KazooTTT <work@kazoottt.top>",
   "license": "MIT",

package/dist/pr-3u9dEVEc.mjs

@@ -1,3 +0,0 @@
-import { a as generatePRMessage, c as getBranchCategory, d as getCommitsBetweenBranches, f as getGitInfo, i as generateMergeBranchName, l as getBranchLastCommitTime, n as createMergeBranch, o as generatePRUrl, p as parseRemoteUrl, r as createPullRequest, s as getAllBranches, t as copyToClipboard, u as getBranchesWithInfo } from "./index.mjs";
-
-export { copyToClipboard, createMergeBranch, createPullRequest, generateMergeBranchName, generatePRMessage, generatePRUrl, getAllBranches, getBranchCategory, getBranchLastCommitTime, getBranchesWithInfo, getCommitsBetweenBranches, getGitInfo, parseRemoteUrl };