Skip to content

Commit dd75b9f

Browse files
authored
Remove autoMerge variable from prCreate (#934)
* Remove autoMerge variable from prCreate * Rewrite broken condition
1 parent 19fb9ba commit dd75b9f

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Diff for: src/cml.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,6 @@ class CML {
344344
remote = GIT_REMOTE,
345345
globs = ['dvc.lock', '.gitignore'],
346346
md,
347-
autoMerge,
348347
merge,
349348
rebase,
350349
squash
@@ -400,7 +399,7 @@ class CML {
400399
await exec(`git checkout -b ${source}`);
401400
await exec(`git add ${paths.join(' ')}`);
402401
let commitMessage = `CML PR for ${shaShort}`;
403-
if (!autoMerge) {
402+
if (!(merge || rebase || squash)) {
404403
commitMessage += ' [skip ci]';
405404
}
406405
await exec(`git commit -m "${commitMessage}"`);

0 commit comments

Comments
 (0)