@toon-protocol/rig 5.1.0 → 5.3.0

package/dist/{chunk-J6GNB54J.js → chunk-DGF7WCRW.js}

@@ -12,7 +12,7 @@ import {
   parseMaintainers,
   queryRelay,
   resolveIdentity
-} from "./chunk-ITC7ESTZ.js";
+} from "./chunk-OVZJ5P6E.js";
 import {
   defaultDaemonPort,
   standaloneForced,
@@ -1383,7 +1383,7 @@ function serializePushResult(plan, result) {
 var NonFastForwardError = class extends Error {
   constructor(refs) {
     super(
-      `non-fast-forward update rejected for ${refs.map((r) => r.refname).join(", ")} \u2014 re-run with force to overwrite the remote ref(s)`
+      `non-fast-forward update rejected for ${refs.map((r) => r.refname).join(", ")} \u2014 run \`rig fetch\` and integrate the remote commits, or re-run with force to overwrite the remote ref(s)`
     );
     this.refs = refs;
     this.name = "NonFastForwardError";
@@ -3188,13 +3188,23 @@ rig can create one for you: re-run \`rig init --git-init\` (in a terminal, plain
     this.name = "NotAGitRepositoryError";
   }
 };
+var PrMergeError = class extends Error {
+  constructor(code, message) {
+    super(message);
+    this.code = code;
+    this.name = "PrMergeError";
+  }
+  code;
+};
 function nonFastForwardLines(refs) {
   return [
     "Push rejected: non-fast-forward update for:",
     ...refs.map(
       (r) => `  ${r.refname}  remote ${r.remoteSha.slice(0, 7)} is not an ancestor of local ${r.localSha.slice(0, 7)}`
     ),
-    "The remote moved since your last push. Re-run with --force to overwrite it",
+    "The remote moved since your last push. Run `rig fetch`, integrate the remote",
+    "commits (merge or rebase), then push again.",
+    "Re-running with --force overwrites the remote instead.",
     "WARNING: --force rewrites the published ref history for every reader of this repo."
   ];
 }
@@ -3265,6 +3275,13 @@ function describeError(err, command = "push") {
       json: { error: "missing_identity", detail: err.message }
     };
   }
+  if (err instanceof PrMergeError) {
+    return {
+      code: err.code,
+      lines: err.message.split("\n"),
+      json: { error: err.code, detail: err.message }
+    };
+  }
   if (err instanceof NonFastForwardError) {
     return {
       code: "non_fast_forward",
@@ -4306,6 +4323,7 @@ export {
   UnknownRemoteError,
   MultiUrlRemoteError,
   NotAGitRepositoryError,
+  PrMergeError,
   emitCliError,
   resolveRepoRoot,
   initGitRepository,
@@ -4323,4 +4341,4 @@ export {
   assembleCiStatus,
   runCiStatus
 };
-//# sourceMappingURL=chunk-J6GNB54J.js.map
+//# sourceMappingURL=chunk-DGF7WCRW.js.map