@eigenpal/cli 0.10.54 → 0.10.56
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +4 -1
- package/package.json +1 -1
package/dist/cli.js
CHANGED
|
@@ -189277,7 +189277,7 @@ import { fileURLToPath as fileURLToPath9 } from "url";
|
|
|
189277
189277
|
// package.json
|
|
189278
189278
|
var package_default = {
|
|
189279
189279
|
name: "@eigenpal/cli",
|
|
189280
|
-
version: "0.10.
|
|
189280
|
+
version: "0.10.56",
|
|
189281
189281
|
description: "Eigenpal CLI — author and run document workflows from your terminal. Agent-ready.",
|
|
189282
189282
|
keywords: [
|
|
189283
189283
|
"eigenpal",
|
|
@@ -190507,6 +190507,9 @@ async function requirePushedMain(gitRoot, config2) {
|
|
|
190507
190507
|
function checkoutOriginalBranch(gitRoot, branch) {
|
|
190508
190508
|
if (gitOutput2(["rev-parse", "--abbrev-ref", "HEAD"], gitRoot) === branch)
|
|
190509
190509
|
return;
|
|
190510
|
+
if (gitOutput2(["rev-parse", "--verify", "MERGE_HEAD"], gitRoot)) {
|
|
190511
|
+
runGit(["merge", "--abort"], { cwd: gitRoot });
|
|
190512
|
+
}
|
|
190510
190513
|
runGitStrict2(["checkout", branch], { cwd: gitRoot });
|
|
190511
190514
|
}
|
|
190512
190515
|
async function mergeCurrentBranchToMain(input) {
|