merge-steward 0.9.0 → 0.9.1
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/github/shell-git.js +1 -1
- package/package.json +1 -1
package/dist/github/shell-git.js
CHANGED
|
@@ -115,7 +115,7 @@ export class ShellGitOperations {
|
|
|
115
115
|
// PR branches are always remote refs — use explicit origin/ prefix
|
|
116
116
|
// because git DWIM doesn't reliably resolve bare names in worktrees.
|
|
117
117
|
const mergeRef = prBranch.startsWith("origin/") ? prBranch : `origin/${prBranch}`;
|
|
118
|
-
const mergeArgs = ["merge", "--no-ff"];
|
|
118
|
+
const mergeArgs = ["merge", "--no-ff", "-X", "patience"];
|
|
119
119
|
if (mergeMessage)
|
|
120
120
|
mergeArgs.push("-m", mergeMessage);
|
|
121
121
|
mergeArgs.push(mergeRef);
|